vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linux/getroot: Fix error handling.

Browse source 
Found by: Coverity scan.
This commit is contained in:
Vladimir Serbinenko 2015-01-26 09:51:48 +01:00
parent 5adc6d76d3
commit cba5a85a67
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
grub-core/osdep/linux/getroot.c
View file

@ -226,7 +226,7 @@ grub_find_root_devices_from_btrfs (const char *dir)
char **ret; char **ret;
fd = open (dir, 0); fd = open (dir, 0);
if (!fd) if (fd < 0)
return NULL; return NULL;
if (ioctl (fd, BTRFS_IOC_FS_INFO, &fsi) < 0) if (ioctl (fd, BTRFS_IOC_FS_INFO, &fsi) < 0)
@ -274,11 +274,11 @@ get_btrfs_fs_prefix (const char *mount_path)
args.objectid = GRUB_BTRFS_TREE_ROOT_OBJECTID; args.objectid = GRUB_BTRFS_TREE_ROOT_OBJECTID;
if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0) if (ioctl (fd, BTRFS_IOC_INO_LOOKUP, &args) < 0)
return NULL; goto fail;
tree_id = args.treeid; tree_id = args.treeid;
if (fstat (fd, &st) < 0) if (fstat (fd, &st) < 0)
return NULL; goto fail;
inode_id = st.st_ino; inode_id = st.st_ino;
while (tree_id != GRUB_BTRFS_ROOT_VOL_OBJECTID while (tree_id != GRUB_BTRFS_ROOT_VOL_OBJECTID
@ -309,10 +309,10 @@ get_btrfs_fs_prefix (const char *mount_path)
sargs.key.nr_items = 1; sargs.key.nr_items = 1;
if (ioctl (fd, BTRFS_IOC_TREE_SEARCH, &sargs) < 0) if (ioctl (fd, BTRFS_IOC_TREE_SEARCH, &sargs) < 0)
return NULL; goto fail;
if (sargs.key.nr_items == 0) if (sargs.key.nr_items == 0)
return NULL; goto fail;
tree_id = sargs.buf[2]; tree_id = sargs.buf[2];
br = (struct grub_btrfs_root_backref *) (sargs.buf + 4); br = (struct grub_btrfs_root_backref *) (sargs.buf + 4);
@ -336,10 +336,10 @@ get_btrfs_fs_prefix (const char *mount_path)
sargs.key.max_type = GRUB_BTRFS_ITEM_TYPE_INODE_REF; sargs.key.max_type = GRUB_BTRFS_ITEM_TYPE_INODE_REF;
if (ioctl (fd, BTRFS_IOC_TREE_SEARCH, &sargs) < 0) if (ioctl (fd, BTRFS_IOC_TREE_SEARCH, &sargs) < 0)
return NULL; goto fail;
if (sargs.key.nr_items == 0) if (sargs.key.nr_items == 0)
return NULL; goto fail;
inode_id = sargs.buf[2]; inode_id = sargs.buf[2];
@ -362,6 +362,10 @@ get_btrfs_fs_prefix (const char *mount_path)
if (!ret) if (!ret)
return xstrdup ("/"); return xstrdup ("/");
return ret; return ret;
fail:
free (ret);
close (fd);
return NULL;
} }
@ -688,7 +692,7 @@ char *
grub_util_part_to_disk (const char *os_dev, struct stat *st, grub_util_part_to_disk (const char *os_dev, struct stat *st,
int *is_part) int *is_part)
{ {
char *path = xmalloc (PATH_MAX); char *path;
if (! S_ISBLK (st->st_mode)) if (! S_ISBLK (st->st_mode))
{ {
@ -696,6 +700,8 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
return xstrdup (os_dev); return xstrdup (os_dev);
} }
path = xmalloc (PATH_MAX);
if (! realpath (os_dev, path)) if (! realpath (os_dev, path))
return NULL; return NULL;