From: B Horn <b@horn.uk>
Date: Sun, 12 May 2024 05:22:51 +0000 (+0100)
Subject: fs/hfsplus: Set a grub_errno if mount fails
X-Git-Tag: archive/raspbian/2.12-8+rpi1^2~65
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=65999e4a4dac0035b19dc87e4ad0a3392b4c8999;p=grub2.git

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>

Gbp-Pq: Topic cve-2025-jan
Gbp-Pq: Name fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
---

diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
index 295822f..de71fd4 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);