a0b2acecaa
Avoid to the heap-based buffer overflow. Upgrade to the below package to fix the CVE issue: grub2-2.02-0.86.el7.centos.src.rpm At the same time adjust the context and drop 0004-grub2-remove-32b-requirements.patch since it already had been included in the new version. Story: 2008532 Task: 41664 Change-Id: I7943127323ee28457ffe0a4ece54764633f86d9f Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 25964e485c769efcccf853babcc8263eb1c89baf Mon Sep 17 00:00:00 2001
|
|
From: jmckenna <jason.mckenna@windriver.com>
|
|
Date: Wed, 28 Mar 2018 12:53:34 -0400
|
|
Subject: WRS: 0010-grub2-add-tboot.patch
|
|
|
|
---
|
|
SOURCES/grub.macros | 5 +++++
|
|
SOURCES/grub.patches | 1 +
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 9ef91d6..ffdd23c 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -82,6 +82,10 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
+%global wrs_modules " multiboot multiboot2"
|
|
+%else
|
|
+%global wrs_modules ""
|
|
+
|
|
%endif
|
|
%ifarch %{ix86}
|
|
%global target_cpu_name %{_arch}
|
|
@@ -347,6 +351,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\
|
|
search_label serial sleep syslinuxcfg test tftp \\\
|
|
video xfs" \
|
|
GRUB_MODULES+=%{efi_modules} \
|
|
+GRUB_MODULES+=%{wrs_modules} \
|
|
%{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7} %{8} %{9} %{10}}} \
|
|
%{nil}
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index d7475f0..e24bd8c 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -333,3 +334,4 @@ Patch0286: 0286-efinet-also-use-the-firmware-acceleration-for-http.patch
|
|
Patch0333: 0333-linuxefi-fail-kernel-validation-without-shim-protoco.patch
|
|
Patch0334: 0334-linux-Fix-integer-overflows-in-initrd-size-handling.patch
|
|
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
|
|
+Patch1001: 1001-add-tboot.patch
|
|
--
|
|
2.7.4
|
|
|