From 5b716fa8e2562a1f942c2d920a3f727c3841c4f3 Mon Sep 17 00:00:00 2001 From: Yongxin Liu Date: Wed, 28 Oct 2020 11:18:06 +0800 Subject: grub: fix several CVEs in grub 2.04 Backport patches from https://git.savannah.gnu.org/git/grub.git to fix some CVEs. Here is the list. CVE-2020-14308: 0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch 0002-lvm-Add-LVM-cache-logical-volume-handling.patch 0003-calloc-Use-calloc-at-most-places.patch CVE-2020-14309, CVE-2020-14310, CVE-2020-14311: 0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch 0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch CVE-2020-15706: 0006-script-Remove-unused-fields-from-grub_script_functio.patch 0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch CVE-2020-15707: 0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch (From OE-Core rev: af52a1f1f3a2ab61fea263c3dd17628f359ec906) Signed-off-by: Yongxin Liu Signed-off-by: Richard Purdie (cherry picked from commit 67329184985a03534f11f95e9df5f9fb2305a261) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-bsp/grub/grub2.inc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'meta/recipes-bsp/grub/grub2.inc') diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index e3d929a824..ef3e64671f 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -19,6 +19,14 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://grub-module-explicitly-keeps-symbole-.module_license.patch \ file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ file://CVE-2020-10713.patch \ + file://0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch \ + file://0002-lvm-Add-LVM-cache-logical-volume-handling.patch \ + file://0003-calloc-Use-calloc-at-most-places.patch \ + file://0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch \ + file://0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch \ + file://0006-script-Remove-unused-fields-from-grub_script_functio.patch \ + file://0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch \ + file://0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" -- cgit v1.2.3-54-g00ecf