diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/0024-zfsinfo-Correct-a-check-for-error-allocating-memory.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0024-zfsinfo-Correct-a-check-for-error-allocating-memory.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0024-zfsinfo-Correct-a-check-for-error-allocating-memory.patch b/meta/recipes-bsp/grub/files/0024-zfsinfo-Correct-a-check-for-error-allocating-memory.patch new file mode 100644 index 0000000000..555dc19168 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0024-zfsinfo-Correct-a-check-for-error-allocating-memory.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From b085da8efda9b81f94aa197ee045226563554fdf Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Thu, 26 Nov 2020 10:56:45 +0000 | ||
4 | Subject: [PATCH] zfsinfo: Correct a check for error allocating memory | ||
5 | |||
6 | While arguably the check for grub_errno is correct, we should really be | ||
7 | checking the return value from the function since it is always possible | ||
8 | that grub_errno was set elsewhere, making this code behave incorrectly. | ||
9 | |||
10 | Fixes: CID 73668 | ||
11 | |||
12 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
13 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
14 | |||
15 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7aab03418ec6a9b991aa44416cb2585aff4e7972] | ||
16 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
17 | --- | ||
18 | grub-core/fs/zfs/zfsinfo.c | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c | ||
22 | index c8a28ac..bf29180 100644 | ||
23 | --- a/grub-core/fs/zfs/zfsinfo.c | ||
24 | +++ b/grub-core/fs/zfs/zfsinfo.c | ||
25 | @@ -358,8 +358,8 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc, | ||
26 | return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); | ||
27 | |||
28 | devname = grub_file_get_device_name (args[0]); | ||
29 | - if (grub_errno) | ||
30 | - return grub_errno; | ||
31 | + if (devname == NULL) | ||
32 | + return GRUB_ERR_OUT_OF_MEMORY; | ||
33 | |||
34 | dev = grub_device_open (devname); | ||
35 | grub_free (devname); | ||