b9f070c2f2
Resolves: CVE-2024-45781 CVE-2024-45783 CVE-2024-45778 Resolves: CVE-2024-45775 CVE-2024-45780 CVE-2024-45774 Resolves: CVE-2025-0690 CVE-2025-1118 CVE-2024-45782 Resolves: CVE-2025-0624 CVE-2024-45779 CVE-2024-45776 Resolves: CVE-2025-0622 CVE-2025-0677 Resolves: #RHEL-80691 Resolves: #RHEL-80690 Resolves: #RHEL-80689 Resolves: #RHEL-80687 Resolves: #RHEL-80686 Signed-off-by: Leo Sandoval <lsandova@redhat.com> Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alec Brown <alec.r.brown@oracle.com>
|
|
Date: Wed, 22 Jan 2025 02:55:12 +0000
|
|
Subject: [PATCH] disk/ieee1275/ofdisk: Call grub_ieee1275_close() when
|
|
grub_malloc() fails
|
|
|
|
In the dev_iterate() function a handle is opened but isn't closed when
|
|
grub_malloc() returns NULL. We should fix this by closing it on error.
|
|
|
|
Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/disk/ieee1275/ofdisk.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
|
|
index 6c628635f..71237b256 100644
|
|
--- a/grub-core/disk/ieee1275/ofdisk.c
|
|
+++ b/grub-core/disk/ieee1275/ofdisk.c
|
|
@@ -269,7 +269,10 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
|
|
|
|
buf = grub_malloc (sz);
|
|
if (!buf)
|
|
- return;
|
|
+ {
|
|
+ grub_ieee1275_close (ihandle);
|
|
+ return;
|
|
+ }
|
|
bufptr = grub_stpcpy (buf, alias->path);
|
|
|
|
for (i = 0; i < args.nentries; i++)
|