diff options
-rw-r--r-- | meta/recipes-bsp/grub/files/0012-gnulib-regcomp-Fix-uninitialized-re_token.patch | 55 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 56 insertions, 0 deletions
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 @@ | |||
1 | From 512b6bb380a77233b88c84b7a712896c70281d2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Tue, 24 Nov 2020 18:04:22 +0000 | ||
4 | Subject: [PATCH] gnulib/regcomp: Fix uninitialized re_token | ||
5 | |||
6 | This issue has been fixed in the latest version of gnulib, so to | ||
7 | maintain consistency, I've backported that change rather than doing | ||
8 | something different. | ||
9 | |||
10 | Fixes: CID 73828 | ||
11 | |||
12 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
13 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
14 | |||
15 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=03477085f9a33789ba6cca7cd49ab9326a1baa0e] | ||
16 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
17 | --- | ||
18 | conf/Makefile.extra-dist | 1 + | ||
19 | .../gnulib-patches/fix-regcomp-uninit-token.patch | 15 +++++++++++++++ | ||
20 | 2 files changed, 16 insertions(+) | ||
21 | create mode 100644 grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch | ||
22 | |||
23 | diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist | ||
24 | index d27d3a9..ffe6829 100644 | ||
25 | --- a/conf/Makefile.extra-dist | ||
26 | +++ b/conf/Makefile.extra-dist | ||
27 | @@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh | ||
28 | |||
29 | EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch | ||
30 | EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch | ||
31 | +EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch | ||
32 | EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch | ||
33 | EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch | ||
34 | EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch | ||
35 | diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch | ||
36 | new file mode 100644 | ||
37 | index 0000000..02e0631 | ||
38 | --- /dev/null | ||
39 | +++ b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch | ||
40 | @@ -0,0 +1,15 @@ | ||
41 | +--- a/lib/regcomp.c 2020-11-24 17:06:08.159223858 +0000 | ||
42 | ++++ b/lib/regcomp.c 2020-11-24 17:06:15.630253923 +0000 | ||
43 | +@@ -3808,11 +3808,7 @@ | ||
44 | + create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, | ||
45 | + re_token_type_t type) | ||
46 | + { | ||
47 | +- re_token_t t; | ||
48 | +-#if defined GCC_LINT || defined lint | ||
49 | +- memset (&t, 0, sizeof t); | ||
50 | +-#endif | ||
51 | +- t.type = type; | ||
52 | ++ re_token_t t = { .type = type }; | ||
53 | + return create_token_tree (dfa, left, right, &t); | ||
54 | + } | ||
55 | + | ||
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 \ | |||
58 | file://0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch \ | 58 | file://0009-gnulib-regcomp-Fix-uninitialized-token-structure.patch \ |
59 | file://0010-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch \ | 59 | file://0010-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch \ |
60 | file://0011-gnulib-regexec-Fix-possible-null-dereference.patch \ | 60 | file://0011-gnulib-regexec-Fix-possible-null-dereference.patch \ |
61 | file://0012-gnulib-regcomp-Fix-uninitialized-re_token.patch \ | ||
61 | " | 62 | " |
62 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 63 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
63 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 64 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |