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

fs/f2fs: Set a grub_errno if mount fails

It was previously possible for grub_errno to not be set when
grub_f2fs_mount() failed if nat_bitmap_ptr() returned NULL.

This issue is solved by ensuring a grub_errno is set in the fail case.

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-f2fs-Set-a-grub_errno-if-mount-fails.patch
---

diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
index 855e246..db8a65f 100644
--- a/grub-core/fs/f2fs.c
+++ b/grub-core/fs/f2fs.c
@@ -872,6 +872,9 @@ grub_f2fs_mount (grub_disk_t disk)
   return data;
 
  fail:
+  if (grub_errno == GRUB_ERR_NONE)
+    grub_error (GRUB_ERR_BAD_FS, "not a F2FS filesystem");
+
   grub_free (data);
 
   return NULL;