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

Btrfs-progs: add missing error handling in find_mount_root() 

The strdup() function can fail, in which case it returns NULL and sets
errno [1]. Therefore add the missing error check after calling strdup()
at find_mount_root().

[1] - http://man7.org/linux/man-pages/man3/strdup.3p.html

Reviewed-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2019-01-14 13:31:34 +00:00 committed by David Sterba
parent cb8abddb20
commit dc1c561250
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils.c
View File

@ -2062,7 +2062,7 @@ int find_mount_root(const char *path, char **mount_root)
int fd; int fd;
struct mntent *ent; struct mntent *ent;
int len; int len;
int ret; int ret = 0;
int not_btrfs = 1; int not_btrfs = 1;
int longest_matchlen = 0; int longest_matchlen = 0;
char *longest_match = NULL; char *longest_match = NULL;
@ -2085,12 +2085,18 @@ int find_mount_root(const char *path, char **mount_root)
free(longest_match); free(longest_match);
longest_matchlen = len; longest_matchlen = len;
longest_match = strdup(ent->mnt_dir); longest_match = strdup(ent->mnt_dir);
if (!longest_match) {
ret = -errno;
break;
}
not_btrfs = strcmp(ent->mnt_type, "btrfs"); not_btrfs = strcmp(ent->mnt_type, "btrfs");
} }
} }
} }
endmntent(mnttab); endmntent(mnttab);
if (ret)
return ret;
if (!longest_match) if (!longest_match)
return -ENOENT; return -ENOENT;
if (not_btrfs) { if (not_btrfs) {