rpms/grub2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c10s' into a10s

Browse Source
This commit is contained in:
eabdullin 2025-01-08 12:46:02 +03:00
commit a26ed1e662
4 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch Normal file
View File

@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marta Lewandowska <mlewando@redhat.com>
Date: Thu, 21 Nov 2024 11:32:18 -0600
Subject: [PATCH] 10_linux.in: escape semicolon and ampersand on BLS upddate
Besides escaping the character '/', escape ';' and '&' which may be set on on
kernel parameters.
Resolves: #RHEL-68531
Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
Reviewed-by: Leo Sandoval <lsandova@redhat.com>
---
util/grub.d/10_linux.in | 2 ++
1 file changed, 2 insertions(+)
mode change 100644 => 100755 util/grub.d/10_linux.in
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
old mode 100644
new mode 100755
index 041a11529..7754ef853
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -176,6 +176,8 @@ update_bls_cmdline()
options="${options} ${GRUB_CMDLINE_LINUX_DEBUG}"
fi
options="$(echo "${options}" | sed -e 's/\//\\\//g')"
+ options="$(echo "${options}" | sed -e 's/\;/\\\;/g')"
+ options="$(echo "${options}" | sed -e 's/\\&/\\\\&/g')"
sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
done
}

34
0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch Normal file
View File

@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 16 Oct 2024 16:20:24 +1100
Subject: [PATCH] acpi: Fix out of bounds access in grub_acpi_xsdt_find_table()
The calculation of the size of the table was incorrect (copy/pasta from
grub_acpi_rsdt_find_table() I assume...). The entries are 64-bit long.
This causes us to access beyond the end of the table which is causing
crashes during boot on some systems. Typically this is causing a crash
on VMWare when using UEFI and enabling serial autodetection, as
grub_acpi_find_table (GRUB_ACPI_SPCR_SIGNATURE);
Will goes past the end of the table (the SPCR table doesn't exits)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
grub-core/kern/acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/acpi.c b/grub-core/kern/acpi.c
index 48ded4e2ea6e..8ff0835d501f 100644
--- a/grub-core/kern/acpi.c
+++ b/grub-core/kern/acpi.c
@@ -75,7 +75,7 @@ grub_acpi_xsdt_find_table (struct grub_acpi_table_header *xsdt, const char *sig)
return 0;
ptr = (grub_unaligned_uint64_t *) (xsdt + 1);
- s = (xsdt->length - sizeof (*xsdt)) / sizeof (grub_uint32_t);
+ s = (xsdt->length - sizeof (*xsdt)) / sizeof (grub_uint64_t);
for (; s; s--, ptr++)
{
struct grub_acpi_table_header *tbl;

2
grub.patches
View File

@ -278,3 +278,5 @@ Patch0277: 0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
Patch0278: 0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch
Patch0279: 0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
Patch0280: 0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
Patch0281: 0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
Patch0282: 0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch

12
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.12
Release: 1%{?dist}.alma.1
Release: 3%{?dist}.alma.1
Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/
@ -574,9 +574,17 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Mon Dec 09 2024 Eduard Abdullin <eabdullin@almalinux.org> - 2.12-1.alma.1
* Wed Jan 08 2025 Eduard Abdullin <eabdullin@almalinux.org> - 2.12-3.alma.1
- Debrand for AlmaLinux
* Mon Dec 09 2024 Leo Sandoval <lsandova@redhat.com> 2.12-3
- acpi: Fix out of bounds access in grub_acpi_xsdt_find_table()
- Resolves: #RHEL-68690
* Thu Nov 21 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-2
- 10_linux.in: escape semicolon and ampersand on BLS upddate
- Resolves: #RHEL-68531
* Wed Nov 6 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-1
- Rebased to release grub-2.12
- Resolves: #RHEL-15032