6eaa34fe07
- Resolves: CVE-2024-45779 CVE-2024-45778 CVE-2025-1118 - Resolves: CVE-2025-0677 CVE-2024-45782 CVE-2025-0690 - Resolves: CVE-2024-45783 CVE-2025-0624 CVE-2024-45776 - Resolves: CVE-2025-0622 CVE-2024-45774 CVE-2024-45775 - Resolves: CVE-2024-45781 CVE-2024-45780 - Resolves: #RHEL-79700 - Resolves: #RHEL-79341 - Resolves: #RHEL-79875 - Resolves: #RHEL-79849 - Resolves: #RHEL-79707 - Resolves: #RHEL-79857 - Resolves: #RHEL-79709 - Resolves: #RHEL-79846 - Resolves: #RHEL-75737 - Resolves: #RHEL-79713 - Resolves: #RHEL-73785 - Resolves: #RHEL-73787 - Resolves: #RHEL-79704 - Resolves: #RHEL-79702 Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: B Horn <b@horn.uk>
|
|
Date: Sun, 12 May 2024 06:03:58 +0100
|
|
Subject: [PATCH] fs/xfs: Ensuring failing to mount sets a grub_errno
|
|
|
|
It was previously possible for grub_xfs_mount() to return NULL without
|
|
setting grub_errno if the XFS version was invalid. This resulted in it
|
|
being possible for grub_dl_unref() to be called twice allowing the XFS
|
|
module to be unloaded while there were still references to it.
|
|
|
|
Fixing this problem in general by ensuring a grub_errno is set if the
|
|
fail label is reached.
|
|
|
|
Reported-by: B Horn <b@horn.uk>
|
|
Signed-off-by: B Horn <b@horn.uk>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/fs/xfs.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
|
|
index 43be00e99..9d3420ece 100644
|
|
--- a/grub-core/fs/xfs.c
|
|
+++ b/grub-core/fs/xfs.c
|
|
@@ -315,6 +315,8 @@ static int grub_xfs_sb_valid(struct grub_xfs_data *data)
|
|
}
|
|
return 1;
|
|
}
|
|
+
|
|
+ grub_error (GRUB_ERR_BAD_FS, "unsupported XFS filesystem version");
|
|
return 0;
|
|
}
|
|
|
|
@@ -984,7 +986,7 @@ grub_xfs_mount (grub_disk_t disk)
|
|
return data;
|
|
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 an XFS filesystem");
|
|
|
|
grub_free (data);
|