123456789101112131415161718192021222324252627282930313233343536 |
- From 7aab03418ec6a9b991aa44416cb2585aff4e7972 Mon Sep 17 00:00:00 2001
- From: Darren Kenny <darren.kenny@oracle.com>
- Date: Thu, 26 Nov 2020 10:56:45 +0000
- Subject: [PATCH] zfsinfo: Correct a check for error allocating memory
- While arguably the check for grub_errno is correct, we should really be
- checking the return value from the function since it is always possible
- that grub_errno was set elsewhere, making this code behave incorrectly.
- Fixes: CID 73668
- Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
- Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
- Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
- ---
- grub-core/fs/zfs/zfsinfo.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
- index c8a28ac..bf29180 100644
- --- a/grub-core/fs/zfs/zfsinfo.c
- +++ b/grub-core/fs/zfs/zfsinfo.c
- @@ -358,8 +358,8 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc,
- return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
-
- devname = grub_file_get_device_name (args[0]);
- - if (grub_errno)
- - return grub_errno;
- + if (devname == NULL)
- + return GRUB_ERR_OUT_OF_MEMORY;
-
- dev = grub_device_open (devname);
- grub_free (devname);
- --
- 2.14.2
|