grub2/SOURCES/0424-loader-xnu-Check-if-po...

40 lines
1.3 KiB
Diff
Raw Permalink Normal View History

2021-03-02 18:56:20 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@canonical.com>
Date: Mon, 30 Nov 2020 10:36:00 -0300
Subject: [PATCH] loader/xnu: Check if pointer is NULL before using it
Fixes: CID 73654
Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@canonical.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/loader/xnu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
2022-05-10 07:20:45 +00:00
index af885a648..49641b8bb 100644
2021-03-02 18:56:20 +00:00
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
2021-05-18 06:38:48 +00:00
@@ -671,6 +671,9 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile,
2021-03-02 18:56:20 +00:00
char *name, *nameend;
int namelen;
+ if (infoplistname == NULL)
+ return grub_error (GRUB_ERR_BAD_FILENAME, N_("missing p-list filename"));
+
name = get_name_ptr (infoplistname);
nameend = grub_strchr (name, '/');
2021-05-18 06:38:48 +00:00
@@ -702,10 +705,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile,
2021-03-02 18:56:20 +00:00
else
macho = 0;
- if (infoplistname)
2021-05-18 06:38:48 +00:00
- infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST);
2021-03-02 18:56:20 +00:00
- else
- infoplist = 0;
2021-05-18 06:38:48 +00:00
+ infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST);
2021-03-02 18:56:20 +00:00
grub_errno = GRUB_ERR_NONE;
if (infoplist)
{