diff options
-rw-r--r-- | meta/recipes-bsp/grub/files/0046-script-execute-Avoid-crash-when-using-outside-a-func.patch | 37 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0046-script-execute-Avoid-crash-when-using-outside-a-func.patch b/meta/recipes-bsp/grub/files/0046-script-execute-Avoid-crash-when-using-outside-a-func.patch new file mode 100644 index 0000000000..84117a9073 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0046-script-execute-Avoid-crash-when-using-outside-a-func.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From df2505c4c3cf42b0c419c99a5f9e1ce63e5a5938 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Axtens <dja@axtens.net> | ||
3 | Date: Mon, 11 Jan 2021 17:30:42 +1100 | ||
4 | Subject: [PATCH] script/execute: Avoid crash when using "$#" outside a | ||
5 | function scope | ||
6 | |||
7 | "$#" represents the number of arguments to a function. It is only | ||
8 | defined in a function scope, where "scope" is non-NULL. Currently, | ||
9 | if we attempt to evaluate "$#" outside a function scope, "scope" will | ||
10 | be NULL and we will crash with a NULL pointer dereference. | ||
11 | |||
12 | Do not attempt to count arguments for "$#" if "scope" is NULL. This | ||
13 | will result in "$#" being interpreted as an empty string if evaluated | ||
14 | outside a function scope. | ||
15 | |||
16 | Signed-off-by: Daniel Axtens <dja@axtens.net> | ||
17 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
18 | |||
19 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=fe0586347ee46f927ae27bb9673532da9f5dead5] | ||
20 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
21 | --- | ||
22 | grub-core/script/execute.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c | ||
26 | index 5ea2aef..23d34bd 100644 | ||
27 | --- a/grub-core/script/execute.c | ||
28 | +++ b/grub-core/script/execute.c | ||
29 | @@ -485,7 +485,7 @@ gettext_putvar (const char *str, grub_size_t len, | ||
30 | return 0; | ||
31 | |||
32 | /* Enough for any number. */ | ||
33 | - if (len == 1 && str[0] == '#') | ||
34 | + if (len == 1 && str[0] == '#' && scope != NULL) | ||
35 | { | ||
36 | grub_snprintf (*ptr, 30, "%u", scope->argv.argc); | ||
37 | *ptr += grub_strlen (*ptr); | ||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 0454b09d52..75ef31f249 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -92,6 +92,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ | |||
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 | file://0044-script-execute-Fix-NULL-dereference-in-grub_script_e.patch \ |
94 | file://0045-commands-ls-Require-device_name-is-not-NULL-before-p.patch \ | 94 | file://0045-commands-ls-Require-device_name-is-not-NULL-before-p.patch \ |
95 | file://0046-script-execute-Avoid-crash-when-using-outside-a-func.patch \ | ||
95 | " | 96 | " |
96 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 97 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
97 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 98 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |