From f3a9f0ff07c2479134f1c253a268aa25057ffc28 Mon Sep 17 00:00:00 2001 From: Xue Liu Date: Fri, 8 Nov 2024 18:04:36 +0800 Subject: [PATCH] LoongArch: Clear buffer for screen info --- bugfix-Clear-buffer-for-screen-info.patch | 25 +++++++++++++++++++++++ grub.patches | 1 + grub2.spec | 8 +++++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 bugfix-Clear-buffer-for-screen-info.patch diff --git a/bugfix-Clear-buffer-for-screen-info.patch b/bugfix-Clear-buffer-for-screen-info.patch new file mode 100644 index 0000000..5dffae2 --- /dev/null +++ b/bugfix-Clear-buffer-for-screen-info.patch @@ -0,0 +1,25 @@ +From f1f173b06c7e5f3ae034a4c64d525434a20ed4bd Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Fri, 8 Nov 2024 17:31:48 +0800 +Subject: [PATCH] bugfix: Clear buffer for screen info + +--- + grub-core/loader/loongarch64/linux-elf.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/loader/loongarch64/linux-elf.c b/grub-core/loader/loongarch64/linux-elf.c +index c5d9434..b495a2b 100644 +--- a/grub-core/loader/loongarch64/linux-elf.c ++++ b/grub-core/loader/loongarch64/linux-elf.c +@@ -167,6 +167,8 @@ alloc_screen_info (void) + if (status != GRUB_EFI_SUCCESS) + return NULL; + ++ grub_memset((void *)si, 0, sizeof(struct screen_info)); ++ + status = b->install_configuration_table (&compat_screen_info_guid, si); + if (status != GRUB_EFI_SUCCESS) + goto free_mem; +-- +2.43.0 + diff --git a/grub.patches b/grub.patches index aa7e828..c0bb713 100644 --- a/grub.patches +++ b/grub.patches @@ -241,3 +241,4 @@ Patch240: 0061-Add-BLS-support-to-grub-mkconfig.patch Patch241: 0064-Add-grub2-switch-to-blscfg.patch Patch242: 0001-newfeature-tpcm-add-hygon-tpcm-support.patch Patch243: 10_linux-fix-missing-ro-in-kernel-boot-parameters.patch +Patch244: bugfix-Clear-buffer-for-screen-info.patch diff --git a/grub2.spec b/grub2.spec index d830515..6528e70 100644 --- a/grub2.spec +++ b/grub2.spec @@ -19,7 +19,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 25 +Release: 26 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -461,6 +461,12 @@ fi %{_datadir}/man/man* %changelog +* Fri Nov 8 2024 liuxue - 1:2.12-26 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Clear buffer for screen info + * Thu Oct 10 2024 zhangqiumiao - 1:2.12-25 - Type:bugfix - CVE:NA -- Gitee