Skip to contentSkip to conversation

grub: upgrade 2.04 -> 2.06~rc1

PATCH Superseded Naveen Saini 1 participant 1 message Mar 18, 2021

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 grub: upgrade 2.04 -> 2.06~rc1

2.06 RC1 release have a number of CVEs fixed:
CVE-2020-15705
CVE-2021-3418
CVE-2020-27749
CVE-2021-20233
CVE-2021-20225
CVE-2020-25647
CVE-2020-25632
CVE-2020-27779
CVE-2020-14372
CVE-2020-15707
CVE-2020-15706
CVE-2020-14309
CVE-2020-14310
CVE-2020-14311
CVE-2020-14308
CVE-2020-10713
CVE-2014-4607

Dropped backported patches.

Official tar file for 2.06-rc1 is not available, so need to download gnublib module additionally in order to build from git repo.

---
v2:
Using tar source from https://alpha.gnu.org/gnu/grub/
Set PV to "2.04+${2.06~rc1}"

---
 ...507ce30f775008e093580f0c9499dfb2c485.patch |   47 -
 .../grub/files/CVE-2020-10713.patch           |   73 -
 ...308-calloc-Use-calloc-at-most-places.patch | 1863 -----------------
 ...low-checking-primitives-where-we-do-.patch | 1330 ------------
 ...se-after-free-when-redefining-a-func.patch |  117 --
 ...er-overflows-in-initrd-size-handling.patch |  177 --
 .../grub/files/autogen.sh-exclude-pc.patch    |   15 +-
 ...-we-always-have-an-overflow-checking.patch |  246 ---
 meta/recipes-bsp/grub/files/determinism.patch |   58 +-
 ...dd-LVM-cache-logical-volume-handling.patch |  287 ---
 ...e-arithmetic-primitives-that-check-f.patch |   94 -
 ...used-fields-from-grub_script_functio.patch |   37 -
 .../{grub-efi_2.04.bb => grub-efi_git.bb}     |    2 -
 meta/recipes-bsp/grub/grub2.inc               |   21 +-
 .../grub/{grub_2.04.bb => grub_git.bb}        |    0
 15 files changed, 51 insertions(+), 4316 deletions(-)
 delete mode 100644 meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-10713.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-Use-calloc-at-most-places.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch
 delete mode 100644 meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 delete mode 100644 meta/recipes-bsp/grub/files/calloc-Make-sure-we-always-have-an-overflow-checking.patch
 delete mode 100644 meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical-volume-handling.patch
 delete mode 100644 meta/recipes-bsp/grub/files/safemath-Add-some-arithmetic-primitives-that-check-f.patch
 delete mode 100644 meta/recipes-bsp/grub/files/script-Remove-unused-fields-from-grub_script_functio.patch
 rename meta/recipes-bsp/grub/{grub-efi_2.04.bb => grub-efi_git.bb} (98%)
 rename meta/recipes-bsp/grub/{grub_2.04.bb => grub_git.bb} (100%)
meta/recipes-bsp/grub/files/6643507ce30f775008e093580f0c9499dfb2c485.patch deleted +0 -47
deleted file mode 100644
index 8aa2091444..0000000000
@@ -1,47 +0,0 @@
-From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001
-From: Simon Hardy <[email protected]>
-Date: Tue, 24 Mar 2020 13:29:12 +0000
-Subject: build: Fix GRUB i386-pc build with Ubuntu gcc
-
-With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is
-output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to
-fail with: "error: Decompressor is too big."
-
-This seems to be caused by a section .note.gnu.property that is placed at an
-offset such that objcopy needs to pad the img file with zeros.
-
-This issue is present on:
-Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0
-Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008
-
-This issue is not present on:
-Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0
-RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4)
-
-The issue can be fixed by removing the section using objcopy as shown in
-this patch.
-
-Signed-off-by: Simon Hardy <[email protected]>
-Reviewed-by: Daniel Kiper <[email protected]>
----
- gentpl.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Upstream-Status: Backport
-
-diff --git a/gentpl.py b/gentpl.py
-index 387588c05..c86550d4f 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -766,7 +766,7 @@ def image(defn, platform):
- if test x$(TARGET_APPLE_LINKER) = x1; then \
-   $(MACHO2IMG) $< $@; \
- else \
--  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \
-+  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
- fi
- """)
- 
--- 
-cgit v1.2.1
-
meta/recipes-bsp/grub/files/CVE-2020-10713.patch deleted +0 -73

73 lines not on this page · raw message

meta/recipes-bsp/grub/files/CVE-2020-14308-calloc-Use-calloc-at-most-places.patch deleted +0 -1863

1,863 lines not on this page · raw message

meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch deleted +0 -1330

1,017 lines not on this page · raw message

meta/recipes-bsp/grub/files/CVE-2020-15706-script-Avoid-a-use-after-free-when-redefining-a-func.patch deleted +0 -117

117 lines not on this page · raw message

meta/recipes-bsp/grub/files/CVE-2020-15707-linux-Fix-integer-overflows-in-initrd-size-handling.patch deleted +0 -177

177 lines not on this page · raw message

meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch +8 -7
index faa7fde232..1323a54a59 100644

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/grub/files/calloc-Make-sure-we-always-have-an-overflow-checking.patch deleted +0 -246

246 lines not on this page · raw message

meta/recipes-bsp/grub/files/determinism.patch +35 -23

58 lines not on this page · raw message

meta/recipes-bsp/grub/files/lvm-Add-LVM-cache-logical-volume-handling.patch deleted +0 -287

287 lines not on this page · raw message

meta/recipes-bsp/grub/files/safemath-Add-some-arithmetic-primitives-that-check-f.patch deleted +0 -94

94 lines not on this page · raw message

meta/recipes-bsp/grub/files/script-Remove-unused-fields-from-grub_script_functio.patch deleted +0 -37
deleted file mode 100644
index 84a80d5ffd..0000000000

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/grub/grub-efi_git.bb renamed from meta/recipes-bsp/grub/grub-efi_2.04.bb +0 -2
similarity index 98%
rename from meta/recipes-bsp/grub/grub-efi_2.04.bb
rename to meta/recipes-bsp/grub/grub-efi_git.bb
index 287845c507..240fde7dbf 100644

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/grub/grub2.inc +8 -13
index f870d41f6a..20a8605b02 100644

Lines of this file are not shown. View the raw message.

meta/recipes-bsp/grub/grub_git.bb renamed from meta/recipes-bsp/grub/grub_2.04.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/grub/grub_2.04.bb
rename to meta/recipes-bsp/grub/grub_git.bb

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.