diff options
| -rw-r--r-- | cmds-receive.c | 7 | ||||
| -rw-r--r-- | cmds-send.c | 14 | ||||
| -rw-r--r-- | cmds-subvolume.c | 7 | ||||
| -rw-r--r-- | utils.c | 11 |
4 files changed, 39 insertions, 0 deletions
diff --git a/cmds-receive.c b/cmds-receive.c index 20b3db09..03d21e90 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -848,6 +848,13 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd, ret = -EINVAL; goto out; } + if (ret > 0) { + fprintf(stderr, + "ERROR: %s doesn't belong to btrfs mount point\n", + dest_dir_full_path); + ret = -EINVAL; + goto out; + } r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME); if (r->mnt_fd < 0) { ret = -errno; diff --git a/cmds-send.c b/cmds-send.c index 9ec52dcd..7141c073 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -355,6 +355,13 @@ static int init_root_path(struct btrfs_send *s, const char *subvol) ret = -EINVAL; goto out; } + if (ret > 0) { + fprintf(stderr, + "ERROR: %s doesn't belong to btrfs mount point\n", + subvol); + ret = -EINVAL; + goto out; + } s->mnt_fd = open(s->root_path, O_RDONLY | O_NOATIME); if (s->mnt_fd < 0) { @@ -587,6 +594,13 @@ int cmd_send(int argc, char **argv) strerror(-ret)); goto out; } + if (ret > 0) { + fprintf(stderr, + "ERROR: %s doesn't belong to btrfs mount point\n", + subvol); + ret = -EINVAL; + goto out; + } if (strcmp(send.root_path, mount_root) != 0) { ret = -EINVAL; fprintf(stderr, "ERROR: all subvols must be from the " diff --git a/cmds-subvolume.c b/cmds-subvolume.c index 5e821c71..9ab5287b 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -933,6 +933,13 @@ static int cmd_subvol_show(int argc, char **argv) "%s\n", fullpath, strerror(-ret)); goto out; } + if (ret > 0) { + fprintf(stderr, + "ERROR: %s doesn't belong to btrfs mount point\n", + fullpath); + ret = -EINVAL; + goto out; + } ret = 1; svpath = get_subvol_name(mnt, fullpath); @@ -2324,6 +2324,11 @@ int lookup_ino_rootid(int fd, u64 *rootid) return 0; } +/* + * return 0 if a btrfs mount point is found + * return 1 if a mount point is found but not btrfs + * return <0 if something goes wrong + */ int find_mount_root(const char *path, char **mount_root) { FILE *mnttab; @@ -2331,6 +2336,7 @@ int find_mount_root(const char *path, char **mount_root) struct mntent *ent; int len; int ret; + int not_btrfs = 1; int longest_matchlen = 0; char *longest_match = NULL; @@ -2351,6 +2357,7 @@ int find_mount_root(const char *path, char **mount_root) free(longest_match); longest_matchlen = len; longest_match = strdup(ent->mnt_dir); + not_btrfs = strcmp(ent->mnt_type, "btrfs"); } } } @@ -2358,6 +2365,10 @@ int find_mount_root(const char *path, char **mount_root) if (!longest_match) return -ENOENT; + if (not_btrfs) { + free(longest_match); + return 1; + } ret = 0; *mount_root = realpath(longest_match, NULL); |