RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: receive: improved error handling in process_snapshot 

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-09-06 13:08:29 +02:00
parent 1ef93ea863
commit 28fdd0d2ae
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmds-receive.c
View File

@ -166,8 +166,18 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
if (ret < 0)
goto out;
BUG_ON(r->cur_subvol.path);
BUG_ON(r->cur_subvol_path[0]);
if (r->cur_subvol.path) {
error("subvol: another one already started, path ptr: %s",
r->cur_subvol.path);
ret = -EINVAL;
goto out;
}
if (r->cur_subvol_path[0]) {
error("subvol: another one already started, path buf: %s",
r->cur_subvol.path);
ret = -EINVAL;
goto out;
}
if (*r->dest_dir_path == 0) {
strncpy_null(r->cur_subvol_path, path);
@ -224,8 +234,18 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
if (ret < 0)
goto out;
BUG_ON(r->cur_subvol.path);
BUG_ON(r->cur_subvol_path[0]);
if (r->cur_subvol.path) {
error("snapshot: another one already started, path ptr: %s",
r->cur_subvol.path);
ret = -EINVAL;
goto out;
}
if (r->cur_subvol_path[0]) {
error("snapshot: another one already started, path buf: %s",
r->cur_subvol.path);
ret = -EINVAL;
goto out;
}
if (*r->dest_dir_path == 0) {
strncpy_null(r->cur_subvol_path, path);