diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch b/meta/recipes-bsp/grub/files/0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch new file mode 100644 index 0000000000..3fca2aecb5 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0035-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 88361a7fd4e481a76e1159a63c9014fa997ef29c Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Fri, 4 Dec 2020 15:39:00 +0000 | ||
4 | Subject: [PATCH] video/readers/jpeg: Test for an invalid next marker reference | ||
5 | from a jpeg file | ||
6 | |||
7 | While it may never happen, and potentially could be caught at the end of | ||
8 | the function, it is worth checking up front for a bad reference to the | ||
9 | next marker just in case of a maliciously crafted file being provided. | ||
10 | |||
11 | Fixes: CID 73694 | ||
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=5f5eb7ca8e971227e95745abe541df3e1509360e] | ||
17 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
18 | --- | ||
19 | grub-core/video/readers/jpeg.c | 6 ++++++ | ||
20 | 1 file changed, 6 insertions(+) | ||
21 | |||
22 | diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c | ||
23 | index 31359a4..0b6ce3c 100644 | ||
24 | --- a/grub-core/video/readers/jpeg.c | ||
25 | +++ b/grub-core/video/readers/jpeg.c | ||
26 | @@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data) | ||
27 | next_marker = data->file->offset; | ||
28 | next_marker += grub_jpeg_get_word (data); | ||
29 | |||
30 | + if (next_marker > data->file->size) | ||
31 | + { | ||
32 | + /* Should never be set beyond the size of the file. */ | ||
33 | + return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid next reference"); | ||
34 | + } | ||
35 | + | ||
36 | while (data->file->offset + sizeof (data->quan_table[id]) + 1 | ||
37 | <= next_marker) | ||
38 | { | ||