diff options
author | Marta Rybczynska <rybczynska@gmail.com> | 2022-02-18 11:05:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 00:21:37 +0000 |
commit | 8d050d1e45aa7e822c9b92c15506669038068b33 (patch) | |
tree | 491e383c1d06d02bbec9080460c316747c747251 /meta/recipes-bsp | |
parent | 9b69e6916039a75c3abee9dabfeb5421c49f1ae2 (diff) | |
download | poky-8d050d1e45aa7e822c9b92c15506669038068b33.tar.gz |
grub: add a fix for a NULL pointer dereference
This patch adds a fix for a NULL pointer dereference in grub's
script/execute. It is a part of a security series [1].
[1] https://lists.gnu.org/archive/html/grub-devel/2021-03/msg00007.html
(From OE-Core rev: ddf62ae472c3c26af7a4c91e4216c8d5ba4604ac)
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch | 28 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch b/meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch new file mode 100644 index 0000000000..b279222fff --- /dev/null +++ b/meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From f5fb56954e5926ced42a980c3e0842ffd5fea2aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Axtens <dja@axtens.net> | ||
3 | Date: Fri, 3 Apr 2020 23:05:13 +1100 | ||
4 | Subject: [PATCH] script/execute: Fix NULL dereference in | ||
5 | grub_script_execute_cmdline() | ||
6 | |||
7 | Signed-off-by: Daniel Axtens <dja@axtens.net> | ||
8 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=41ae93b2e6c75453514629bcfe684300e3aec0ce] | ||
11 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
12 | --- | ||
13 | grub-core/script/execute.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c | ||
17 | index 7e028e1..5ea2aef 100644 | ||
18 | --- a/grub-core/script/execute.c | ||
19 | +++ b/grub-core/script/execute.c | ||
20 | @@ -940,7 +940,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd) | ||
21 | struct grub_script_argv argv = { 0, 0, 0 }; | ||
22 | |||
23 | /* Lookup the command. */ | ||
24 | - if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0]) | ||
25 | + if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args || ! argv.args[0]) | ||
26 | return grub_errno; | ||
27 | |||
28 | for (i = 0; i < argv.argc; i++) | ||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 2f230065b2..84b8b8d1be 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -90,6 +90,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ | |||
90 | file://0041-util-grub-install-Fix-NULL-pointer-dereferences.patch \ | 90 | file://0041-util-grub-install-Fix-NULL-pointer-dereferences.patch \ |
91 | file://0042-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch \ | 91 | file://0042-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch \ |
92 | file://0043-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch \ | 92 | file://0043-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch \ |
93 | file://0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch \ | ||
93 | " | 94 | " |
94 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 95 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
95 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 96 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |