[dunfell,13/50] grub: fix an unitialized token in gnulib

Message ID	301e2ff664409011d5650339ef22225cd2028041.1645798648.git.steve@sakoman.com
State	Accepted, archived
Commit	301e2ff664409011d5650339ef22225cd2028041
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.210.181, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 13/50] grub: fix an unitialized token in gnulib Date: Fri, 25 Feb 2022 04:25:53 -1000 Message-Id: <301e2ff664409011d5650339ef22225cd2028041.1645798648.git.steve@sakoman.com> In-Reply-To: <cover.1645798648.git.steve@sakoman.com> References: <cover.1645798648.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[dunfell,01/50] openssl: Add fix for CVE-2021-4160 \| expand [dunfell,01/50] openssl: Add fix for CVE-2021-4160 [dunfell,02/50] tiff: fix for CVE-2022-22844 [dunfell,03/50] ruby: 2.7.4 -> 2.7.5 [dunfell,04/50] puzzles: Upstream changed to main branch for development [dunfell,05/50] grub: fix a memory leak [dunfell,06/50] grub: add a fix for a possible NULL dereference [dunfell,07/50] grub: fix a dangling memory pointer [dunfell,08/50] grub: fix wrong handling of argc == 0 [dunfell,09/50] grub: add a fix for malformed device path handling [dunfell,10/50] grub: fix memory leak at error in grub_efi_get_filename() [dunfell,11/50] grub: add a fix for a possible NULL pointer dereference [dunfell,12/50] grub: add a fix for unused variable in gnulib [dunfell,13/50] grub: fix an unitialized token in gnulib [dunfell,14/50] grub: add a fix a NULL pointer dereference in gnulib [dunfell,15/50] grub: add a fix for NULL pointer dereference [dunfell,16/50] grub: fix an unitialized re_token in gnulib [dunfell,17/50] grub: add a fix for unnecessary assignements [dunfell,18/50] grub: add structure initialization in zstd [dunfell,19/50] grub: add a missing NULL check [dunfell,20/50] grub: fix a memory leak [dunfell,21/50] grub: fix a memory leak [dunfell,22/50] grub: fix a memory leak [dunfell,23/50] grub: fix an integer overflow [dunfell,24/50] grub: add a fix for a length check [dunfell,25/50] grub: add a fix for a possible negative shift [dunfell,26/50] grub: add a fix for a memory leak [dunfell,27/50] grub: add a fix for possible integer overflows [dunfell,28/50] grub: fix an error check [dunfell,29/50] grub: add a fix for a memory leak [dunfell,30/50] grub: add a fix for a possible unintended sign extension [dunfell,31/50] grub: add a fix for a possible NULL dereference [dunfell,32/50] grub: add a fix for a memory leak [dunfell,33/50] grub: add a fix for a memory leak [dunfell,34/50] grub: fix a memory leak [dunfell,35/50] grub: remove unneeded return value [dunfell,36/50] grub: fix an integer overflow [dunfell,37/50] grub: fix multiple integer overflows [dunfell,38/50] grub: fix a possible integer overflow [dunfell,39/50] grub: test for malformed jpeg files [dunfell,40/50] grub: remove dead code [dunfell,41/50] grub: fix checking for NULL [dunfell,42/50] grub: add a fix for a memory leak [dunfell,43/50] grub: avoid a memory leak [dunfell,44/50] grub: add a check for a NULL pointer [dunfell,45/50] grub: add a fix for NULL pointer dereference [dunfell,46/50] grub: add a fix for an incorrect cast [dunfell,47/50] grub: fix incorrect use of a negative value [dunfell,48/50] grub: add a fix for a NULL pointer dereference [dunfell,49/50] grub: avoid a NULL pointer dereference [dunfell,50/50] grub: add a fix for a crash in scripts

Message ID

301e2ff664409011d5650339ef22225cd2028041.1645798648.git.steve@sakoman.com

State

Accepted, archived

Commit

301e2ff664409011d5650339ef22225cd2028041

Headers

From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 13/50] grub: fix an unitialized token in gnulib
Date: Fri, 25 Feb 2022 04:25:53 -1000
Message-Id: 
 <301e2ff664409011d5650339ef22225cd2028041.1645798648.git.steve@sakoman.com>
In-Reply-To: <cover.1645798648.git.steve@sakoman.com>
References: <cover.1645798648.git.steve@sakoman.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[dunfell,01/50] openssl: Add fix for CVE-2021-4160 | expand

Commit Message

Steve Sakoman Feb. 25, 2022, 2:25 p.m. UTC

From: Marta Rybczynska <rybczynska@gmail.com>

This change adds a fix for an unitialized token structure in gnulib.
It is a part of a security series [1].

[1] https://lists.gnu.org/archive/html/grub-devel/2021-03/msg00007.html

Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 ...mp-Fix-uninitialized-token-structure.patch | 53 +++++++++++++++++++
 meta/recipes-bsp/grub/grub2.inc               |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-bsp/grub/files/0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch

diff --git a/meta/recipes-bsp/grub/files/0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch b/meta/recipes-bsp/grub/files/0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch
new file mode 100644
index 0000000000..b6e3c7edbe
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch
@@ -0,0 +1,53 @@ 
+From 2af8df02cca7fd4b584575eac304cd03fa23f5cc Mon Sep 17 00:00:00 2001
+From: Darren Kenny <darren.kenny@oracle.com>
+Date: Thu, 22 Oct 2020 13:54:06 +0000
+Subject: [PATCH] gnulib/regcomp: Fix uninitialized token structure
+
+The code is assuming that the value of br_token.constraint was
+initialized to zero when it wasn't.
+
+While some compilers will ensure that, not all do, so it is better to
+fix this explicitly than leave it to chance.
+
+Fixes: CID 73749
+
+Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=75c3d3cec4f408848f575d6d5e30a95bd6313db0]
+Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
+---
+ conf/Makefile.extra-dist                              |  1 +
+ .../lib/gnulib-patches/fix-uninit-structure.patch     | 11 +++++++++++
+ 2 files changed, 12 insertions(+)
+ create mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch
+
+diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
+index 9b01152..9e55458 100644
+--- a/conf/Makefile.extra-dist
++++ b/conf/Makefile.extra-dist
+@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
+ EXTRA_DIST += grub-core/genemuinitheader.sh
+ 
+ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
++EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
+ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
+ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
+ EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch
+diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch
+new file mode 100644
+index 0000000..7b4d9f6
+--- /dev/null
++++ b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch
+@@ -0,0 +1,11 @@
++--- a/lib/regcomp.c	2020-10-22 13:49:06.770168928 +0000
+++++ b/lib/regcomp.c	2020-10-22 13:50:37.026528298 +0000
++@@ -3662,7 +3662,7 @@
++   Idx alloc = 0;
++ #endif /* not RE_ENABLE_I18N */
++   reg_errcode_t ret;
++-  re_token_t br_token;
+++  re_token_t br_token = {0};
++   bin_tree_t *tree;
++ 
++   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index d2a1502d56..df2c8b8a16 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -55,6 +55,7 @@  SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
            file://0006-kern-efi-Fix-memory-leak-on-failure.patch \
            file://0007-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch \
            file://0008-gnulib-regexec-Resolve-unused-variable.patch \
+           file://0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch \
            "
 SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934"
 SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea"

[dunfell,13/50] grub: fix an unitialized token in gnulib

Commit Message

Patch