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