mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
grub: patch CVE-2024-45783
Cherry-pick patch mentioning this CVE. (From OE-Core rev: 662d705f0f947eef2eab5f72764d421698ca0588) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e8a7b959b5
commit
15ddd0137d
@@ -0,0 +1,39 @@
|
|||||||
|
From f7c070a2e28dfab7137db0739fb8db1dc02d8898 Mon Sep 17 00:00:00 2001
|
||||||
|
From: B Horn <b@horn.uk>
|
||||||
|
Date: Sun, 12 May 2024 06:22:51 +0100
|
||||||
|
Subject: [PATCH] fs/hfsplus: Set a grub_errno if mount fails
|
||||||
|
|
||||||
|
It was possible for mount to fail but not set grub_errno. This led to
|
||||||
|
a possible double decrement of the module reference count if the NULL
|
||||||
|
page was mapped.
|
||||||
|
|
||||||
|
Fixing in general as a similar bug was fixed in commit 61b13c187
|
||||||
|
(fs/hfsplus: Set grub_errno to prevent NULL pointer access) and there
|
||||||
|
are likely more variants around.
|
||||||
|
|
||||||
|
Fixes: CVE-2024-45783
|
||||||
|
|
||||||
|
Reported-by: B Horn <b@horn.uk>
|
||||||
|
Signed-off-by: B Horn <b@horn.uk>
|
||||||
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||||||
|
|
||||||
|
CVE: CVE-2024-45783
|
||||||
|
Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=f7c070a2e28dfab7137db0739fb8db1dc02d8898]
|
||||||
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
||||||
|
---
|
||||||
|
grub-core/fs/hfsplus.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
|
||||||
|
index 295822f69..de71fd486 100644
|
||||||
|
--- a/grub-core/fs/hfsplus.c
|
||||||
|
+++ b/grub-core/fs/hfsplus.c
|
||||||
|
@@ -405,7 +405,7 @@ grub_hfsplus_mount (grub_disk_t disk)
|
||||||
|
|
||||||
|
fail:
|
||||||
|
|
||||||
|
- if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
|
||||||
|
+ if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE)
|
||||||
|
grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem");
|
||||||
|
|
||||||
|
grub_free (data);
|
||||||
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
|
|||||||
file://CVE-2024-45781.patch \
|
file://CVE-2024-45781.patch \
|
||||||
file://CVE-2024-45782_CVE-2024-56737.patch \
|
file://CVE-2024-45782_CVE-2024-56737.patch \
|
||||||
file://CVE-2024-45780.patch \
|
file://CVE-2024-45780.patch \
|
||||||
|
file://CVE-2024-45783.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "b30919fa5be280417c17ac561bb1650f60cfb80cc6237fa1e2b6f56154cb9c91"
|
SRC_URI[sha256sum] = "b30919fa5be280417c17ac561bb1650f60cfb80cc6237fa1e2b6f56154cb9c91"
|
||||||
|
|||||||
Reference in New Issue
Block a user