diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch | 28 |
1 files changed, 28 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++) | ||