diff options
author | Marta Rybczynska <rybczynska@gmail.com> | 2022-02-18 11:05:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 00:21:37 +0000 |
commit | b5eaa833ba00a13c4f7dd3d2c057c4976bfae22e (patch) | |
tree | d17e898b6c1488eb3283725e2da01d0913d828e9 | |
parent | acec862ed282c1242e41f9cce79104ace863d9a8 (diff) | |
download | poky-b5eaa833ba00a13c4f7dd3d2c057c4976bfae22e.tar.gz |
grub: remove unneeded return value
This patch removes an uneeded return value in grub's (static)
grub_video_gop_fill_mode_info(). 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: dd8837823a279290aec963be1a2646940719c767)
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>
-rw-r--r-- | meta/recipes-bsp/grub/files/0031-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch | 94 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 95 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0031-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch b/meta/recipes-bsp/grub/files/0031-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch new file mode 100644 index 0000000000..7e4e951245 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0031-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From 2a1e5659763790201a342f8a897c8c9d8d91b1cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Tue, 8 Dec 2020 21:14:31 +0000 | ||
4 | Subject: [PATCH] video/efi_gop: Remove unnecessary return value of | ||
5 | grub_video_gop_fill_mode_info() | ||
6 | |||
7 | The return value of grub_video_gop_fill_mode_info() is never able to be | ||
8 | anything other than GRUB_ERR_NONE. So, rather than continue to return | ||
9 | a value and checking it each time, it is more correct to redefine the | ||
10 | function to not return anything and remove checks of its return value | ||
11 | altogether. | ||
12 | |||
13 | Fixes: CID 96701 | ||
14 | |||
15 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
16 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
17 | |||
18 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=fc5951d3b1616055ef81a019a5affc09d13344d0] | ||
19 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
20 | --- | ||
21 | grub-core/video/efi_gop.c | 25 ++++++------------------- | ||
22 | 1 file changed, 6 insertions(+), 19 deletions(-) | ||
23 | |||
24 | diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c | ||
25 | index 7f9d1c2..db2ee98 100644 | ||
26 | --- a/grub-core/video/efi_gop.c | ||
27 | +++ b/grub-core/video/efi_gop.c | ||
28 | @@ -227,7 +227,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode, | ||
29 | return GRUB_ERR_NONE; | ||
30 | } | ||
31 | |||
32 | -static grub_err_t | ||
33 | +static void | ||
34 | grub_video_gop_fill_mode_info (unsigned mode, | ||
35 | struct grub_efi_gop_mode_info *in, | ||
36 | struct grub_video_mode_info *out) | ||
37 | @@ -252,8 +252,6 @@ grub_video_gop_fill_mode_info (unsigned mode, | ||
38 | out->blit_format = GRUB_VIDEO_BLIT_FORMAT_BGRA_8888; | ||
39 | out->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED | ||
40 | | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); | ||
41 | - | ||
42 | - return GRUB_ERR_NONE; | ||
43 | } | ||
44 | |||
45 | static int | ||
46 | @@ -266,7 +264,6 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo | ||
47 | grub_efi_uintn_t size; | ||
48 | grub_efi_status_t status; | ||
49 | struct grub_efi_gop_mode_info *info = NULL; | ||
50 | - grub_err_t err; | ||
51 | struct grub_video_mode_info mode_info; | ||
52 | |||
53 | status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); | ||
54 | @@ -277,12 +274,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo | ||
55 | continue; | ||
56 | } | ||
57 | |||
58 | - err = grub_video_gop_fill_mode_info (mode, info, &mode_info); | ||
59 | - if (err) | ||
60 | - { | ||
61 | - grub_errno = GRUB_ERR_NONE; | ||
62 | - continue; | ||
63 | - } | ||
64 | + grub_video_gop_fill_mode_info (mode, info, &mode_info); | ||
65 | if (hook (&mode_info, hook_arg)) | ||
66 | return 1; | ||
67 | } | ||
68 | @@ -466,13 +458,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, | ||
69 | |||
70 | info = gop->mode->info; | ||
71 | |||
72 | - err = grub_video_gop_fill_mode_info (gop->mode->mode, info, | ||
73 | - &framebuffer.mode_info); | ||
74 | - if (err) | ||
75 | - { | ||
76 | - grub_dprintf ("video", "GOP: couldn't fill mode info\n"); | ||
77 | - return err; | ||
78 | - } | ||
79 | + grub_video_gop_fill_mode_info (gop->mode->mode, info, | ||
80 | + &framebuffer.mode_info); | ||
81 | |||
82 | framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; | ||
83 | framebuffer.offscreen | ||
84 | @@ -486,8 +473,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, | ||
85 | { | ||
86 | grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); | ||
87 | grub_errno = 0; | ||
88 | - err = grub_video_gop_fill_mode_info (gop->mode->mode, info, | ||
89 | - &framebuffer.mode_info); | ||
90 | + grub_video_gop_fill_mode_info (gop->mode->mode, info, | ||
91 | + &framebuffer.mode_info); | ||
92 | buffer = framebuffer.ptr; | ||
93 | } | ||
94 | |||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index d18e329b96..24a269d90d 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -77,6 +77,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ | |||
77 | file://0028-syslinux-Fix-memory-leak-while-parsing.patch \ | 77 | file://0028-syslinux-Fix-memory-leak-while-parsing.patch \ |
78 | file://0029-normal-completion-Fix-leaking-of-memory-when-process.patch \ | 78 | file://0029-normal-completion-Fix-leaking-of-memory-when-process.patch \ |
79 | file://0030-commands-hashsum-Fix-a-memory-leak.patch \ | 79 | file://0030-commands-hashsum-Fix-a-memory-leak.patch \ |
80 | file://0031-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch \ | ||
80 | " | 81 | " |
81 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 82 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
82 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 83 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |