diff options
author | Marta Rybczynska <rybczynska@gmail.com> | 2022-02-18 11:05:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 00:21:37 +0000 |
commit | f82639b50e3338ebc0a50cbb1a16ca8b197fd33d (patch) | |
tree | 370a933d44a4acc81ce167b81f4810cd0185552f /meta | |
parent | 4463703292afe44f2661305abc166272783aae8f (diff) | |
download | poky-f82639b50e3338ebc0a50cbb1a16ca8b197fd33d.tar.gz |
grub: remove dead code
This patch removes dead code from grub's gfxmenu/gui_list. 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: 0319465b022e211f2a98ba5cee13a68818f5cf87)
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')
-rw-r--r-- | meta/recipes-bsp/grub/files/0036-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch | 34 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0036-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch b/meta/recipes-bsp/grub/files/0036-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch new file mode 100644 index 0000000000..61e5e5797d --- /dev/null +++ b/meta/recipes-bsp/grub/files/0036-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 9433cb3a37c03f22c2fa769121f1f509fd031ae9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Mon, 7 Dec 2020 14:44:47 +0000 | ||
4 | Subject: [PATCH] gfxmenu/gui_list: Remove code that coverity is flagging as | ||
5 | dead | ||
6 | |||
7 | The test of value for NULL before calling grub_strdup() is not required, | ||
8 | since the if condition prior to this has already tested for value being | ||
9 | NULL and cannot reach this code if it is. | ||
10 | |||
11 | Fixes: CID 73659 | ||
12 | |||
13 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
14 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
15 | |||
16 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=4a1aa5917595650efbd46b581368c470ebee42ab] | ||
17 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
18 | --- | ||
19 | grub-core/gfxmenu/gui_list.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c | ||
23 | index 01477cd..df334a6 100644 | ||
24 | --- a/grub-core/gfxmenu/gui_list.c | ||
25 | +++ b/grub-core/gfxmenu/gui_list.c | ||
26 | @@ -771,7 +771,7 @@ list_set_property (void *vself, const char *name, const char *value) | ||
27 | { | ||
28 | self->need_to_recreate_boxes = 1; | ||
29 | grub_free (self->selected_item_box_pattern); | ||
30 | - self->selected_item_box_pattern = value ? grub_strdup (value) : 0; | ||
31 | + self->selected_item_box_pattern = grub_strdup (value); | ||
32 | self->selected_item_box_pattern_inherit = 0; | ||
33 | } | ||
34 | } | ||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 75782b7eb2..1a4be33fca 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -82,6 +82,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ | |||
82 | file://0033-video-fb-video_fb-Fix-multiple-integer-overflows.patch \ | 82 | file://0033-video-fb-video_fb-Fix-multiple-integer-overflows.patch \ |
83 | file://0034-video-fb-video_fb-Fix-possible-integer-overflow.patch \ | 83 | file://0034-video-fb-video_fb-Fix-possible-integer-overflow.patch \ |
84 | file://0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch \ | 84 | file://0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch \ |
85 | file://0036-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch \ | ||
85 | " | 86 | " |
86 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 87 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
87 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 88 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |