[12/46,dunfell] grub: fix an unitialized re_token in gnulib

Message ID	20220218100554.1315511-13-rybczynska@gmail.com
State	Accepted, archived
Commit	0ce9c21b776ef6bfeaef665829324d7a04c22ce9
Headers	show Return-Path: <rybczynska@gmail.com> ip: 209.85.128.41, mailfrom: rybczynska@gmail.com) From: Marta Rybczynska <rybczynska@gmail.com> To: anuj.mittal@intel.com, openembedded-core@lists.openembedded.org, steve@sakoman.com Cc: Marta Rybczynska <rybczynska@gmail.com>, Marta Rybczynska <marta.rybczynska@huawei.com> Subject: [PATCH 12/46][dunfell] grub: fix an unitialized re_token in gnulib Date: Fri, 18 Feb 2022 11:05:20 +0100 Message-Id: <20220218100554.1315511-13-rybczynska@gmail.com> In-Reply-To: <20220218100554.1315511-1-rybczynska@gmail.com> References: <20220218100554.1315511-1-rybczynska@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	grub 2.04 security fixes \| expand [00/46,dunfell] grub 2.04 security fixes [01/46,dunfell] grub: fix a memory leak [02/46,dunfell] grub: add a fix for a possible NULL dereference [03/46,dunfell] grub: fix a dangling memory pointer [04/46,dunfell] grub: fix wrong handling of argc == 0 [05/46,dunfell] grub: add a fix for malformed device path handling [06/46,dunfell] grub: fix memory leak at error in grub_efi_get_filename() [07/46,dunfell] grub: add a fix for a possible NULL pointer dereference [08/46,dunfell] grub: add a fix for unused variable in gnulib [09/46,dunfell] grub: fix an unitialized token in gnulib [10/46,dunfell] grub: add a fix a NULL pointer dereference in gnulib [11/46,dunfell] grub: add a fix for NULL pointer dereference [12/46,dunfell] grub: fix an unitialized re_token in gnulib [13/46,dunfell] grub: add a fix for unnecessary assignements [14/46,dunfell] grub: add structure initialization in zstd [15/46,dunfell] grub: add a missing NULL check [16/46,dunfell] grub: fix a memory leak [17/46,dunfell] grub: fix a memory leak [18/46,dunfell] grub: fix a memory leak [19/46,dunfell] grub: fix an integer overflow [20/46,dunfell] grub: add a fix for a length check [21/46,dunfell] grub: add a fix for a possible negative shift [22/46,dunfell] grub: add a fix for a memory leak [23/46,dunfell] grub: add a fix for possible integer overflows [24/46,dunfell] grub: fix an error check [25/46,dunfell] grub: add a fix for a memory leak [26/46,dunfell] grub: add a fix for a possible unintended sign extension [27/46,dunfell] grub: add a fix for a possible NULL dereference [28/46,dunfell] grub: add a fix for a memory leak [29/46,dunfell] grub: add a fix for a memory leak [30/46,dunfell] grub: fix a memory leak [31/46,dunfell] grub: remove unneeded return value [32/46,dunfell] grub: fix an integer overflow [33/46,dunfell] grub: fix multiple integer overflows [34/46,dunfell] grub: fix a possible integer overflow [35/46,dunfell] grub: test for malformed jpeg files [36/46,dunfell] grub: remove dead code [37/46,dunfell] grub: fix checking for NULL [38/46,dunfell] grub: add a fix for a memory leak [39/46,dunfell] grub: avoid a memory leak [40/46,dunfell] grub: add a check for a NULL pointer [41/46,dunfell] grub: add a fix for NULL pointer dereference [42/46,dunfell] grub: add a fix for an incorrect cast [43/46,dunfell] grub: fix incorrect use of a negative value [44/46,dunfell] grub: add a fix for a NULL pointer dereference [45/46,dunfell] grub: avoid a NULL pointer dereference [46/46,dunfell] grub: add a fix for a crash in scripts

Message ID

20220218100554.1315511-13-rybczynska@gmail.com

State

Accepted, archived

Commit

0ce9c21b776ef6bfeaef665829324d7a04c22ce9

Headers

From: Marta Rybczynska <rybczynska@gmail.com>
To: anuj.mittal@intel.com,
	openembedded-core@lists.openembedded.org,
	steve@sakoman.com
Cc: Marta Rybczynska <rybczynska@gmail.com>,
	Marta Rybczynska <marta.rybczynska@huawei.com>
Subject: [PATCH 12/46][dunfell] grub: fix an unitialized re_token in gnulib
Date: Fri, 18 Feb 2022 11:05:20 +0100
Message-Id: <20220218100554.1315511-13-rybczynska@gmail.com>
In-Reply-To: <20220218100554.1315511-1-rybczynska@gmail.com>
References: <20220218100554.1315511-1-rybczynska@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

grub 2.04 security fixes | expand

Commit Message

Marta Rybczynska Feb. 18, 2022, 10:05 a.m. UTC

This patch adds a fix for an unitialized re_token in grub's 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>
---
 ...b-regcomp-Fix-uninitialized-re_token.patch | 55 +++++++++++++++++++
 meta/recipes-bsp/grub/grub2.inc               |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-bsp/grub/files/0012-gnulib-regcomp-Fix-uninitialized-re_token.patch

diff --git a/meta/recipes-bsp/grub/files/0012-gnulib-regcomp-Fix-uninitialized-re_token.patch b/meta/recipes-bsp/grub/files/0012-gnulib-regcomp-Fix-uninitialized-re_token.patch
new file mode 100644
index 0000000000..0507e0cd66
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/0012-gnulib-regcomp-Fix-uninitialized-re_token.patch
@@ -0,0 +1,55 @@ 
+From 512b6bb380a77233b88c84b7a712896c70281d2f Mon Sep 17 00:00:00 2001
+From: Darren Kenny <darren.kenny@oracle.com>
+Date: Tue, 24 Nov 2020 18:04:22 +0000
+Subject: [PATCH] gnulib/regcomp: Fix uninitialized re_token
+
+This issue has been fixed in the latest version of gnulib, so to
+maintain consistency, I've backported that change rather than doing
+something different.
+
+Fixes: CID 73828
+
+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=03477085f9a33789ba6cca7cd49ab9326a1baa0e]
+Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
+---
+ conf/Makefile.extra-dist                          |  1 +
+ .../gnulib-patches/fix-regcomp-uninit-token.patch | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+)
+ create mode 100644 grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
+
+diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
+index d27d3a9..ffe6829 100644
+--- a/conf/Makefile.extra-dist
++++ b/conf/Makefile.extra-dist
+@@ -30,6 +30,7 @@ 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-null-state-deref.patch
++EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
+ EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-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
+diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
+new file mode 100644
+index 0000000..02e0631
+--- /dev/null
++++ b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
+@@ -0,0 +1,15 @@
++--- a/lib/regcomp.c	2020-11-24 17:06:08.159223858 +0000
+++++ b/lib/regcomp.c	2020-11-24 17:06:15.630253923 +0000
++@@ -3808,11 +3808,7 @@
++ create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
++ 	     re_token_type_t type)
++ {
++-  re_token_t t;
++-#if defined GCC_LINT || defined lint
++-  memset (&t, 0, sizeof t);
++-#endif
++-  t.type = type;
+++  re_token_t t = { .type = type };
++   return create_token_tree (dfa, left, right, &t);
++ }
++ 
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index e7168e75ea..4ddb9fc4f1 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -58,6 +58,7 @@  SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
            file://0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch \
            file://0010-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch \
            file://0011-gnulib-regexec-Fix-possible-null-dereference.patch \
+           file://0012-gnulib-regcomp-Fix-uninitialized-re_token.patch \
            "
 SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934"
 SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea"

[12/46,dunfell] grub: fix an unitialized re_token in gnulib

Commit Message

Patch