marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: fix resource leak in scrub_start() 

Resolves-Coverity-CID: 1125934
Resolves-Coverity-CID: 1125935
Resolves-Coverity-CID: 1125936
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
master
Eric Sandeen 2013-12-12 15:34:16 +08:00 committed by Chris Mason
parent 70749a77fe
commit fd777c3695
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmds-scrub.c
View File

@ -1097,6 +1097,7 @@ static int scrub_start(int argc, char **argv, int resume)
u64 devid;
DIR *dirstream = NULL;
int force = 0;
int nothing_to_resume = 0;
optind = 1;
while ((c = getopt(argc, argv, "BdqrRc:n:f")) != -1) {
@ -1265,7 +1266,8 @@ static int scrub_start(int argc, char **argv, int resume)
if (!do_quiet)
printf("scrub: nothing to resume for %s, fsid %s\n",
path, fsid);
return 2;
nothing_to_resume = 1;
goto out;
}
ret = prg_fd = socket(AF_UNIX, SOCK_STREAM, 0);
@ -1501,6 +1503,8 @@ out:
}
close_file_or_dir(fdmnt, dirstream);
if (nothing_to_resume)
return 2;
if (err)
return 1;
if (e_correctable)