tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video/readers/jpeg: Test for an invalid next marker reference from a jpeg file

Browse Source 
While it may never happen, and potentially could be caught at the end of
the function, it is worth checking up front for a bad reference to the
next marker just in case of a maliciously crafted file being provided.

Fixes: CID 73694

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Darren Kenny 2020-12-04 15:39:00 +00:00 committed by Daniel Kiper
parent 08413f2f4e
commit 5f5eb7ca8e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub-core/video/readers/jpeg.c
View File

@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
next_marker = data->file->offset;
next_marker += grub_jpeg_get_word (data);
if (next_marker > data->file->size)
{
/* Should never be set beyond the size of the file. */
return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid next reference");
}
while (data->file->offset + sizeof (data->quan_table[id]) + 1
<= next_marker)
{