dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0382-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch

b1bcb2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
b1bcb2
From: Darren Kenny <darren.kenny@oracle.com>
b1bcb2
Date: Fri, 4 Dec 2020 15:39:00 +0000
b1bcb2
Subject: [PATCH] video/readers/jpeg: Test for an invalid next marker reference
b1bcb2
 from a jpeg file
b1bcb2
b1bcb2
While it may never happen, and potentially could be caught at the end of
b1bcb2
the function, it is worth checking up front for a bad reference to the
b1bcb2
next marker just in case of a maliciously crafted file being provided.
b1bcb2
b1bcb2
Fixes: CID 73694
b1bcb2
b1bcb2
Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
b1bcb2
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
b1bcb2
---
b1bcb2
 grub-core/video/readers/jpeg.c | 6 ++++++
b1bcb2
 1 file changed, 6 insertions(+)
b1bcb2
b1bcb2
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
b1bcb2
index 2dc2ee10e54..ed6d9bfd160 100644
b1bcb2
--- a/grub-core/video/readers/jpeg.c
b1bcb2
+++ b/grub-core/video/readers/jpeg.c
b1bcb2
@@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
b1bcb2
   next_marker = data->file->offset;
b1bcb2
   next_marker += grub_jpeg_get_word (data);
b1bcb2
 
b1bcb2
+  if (next_marker > data->file->size)
b1bcb2
+    {
b1bcb2
+      /* Should never be set beyond the size of the file. */
b1bcb2
+      return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid next reference");
b1bcb2
+    }
b1bcb2
+
b1bcb2
   while (data->file->offset + sizeof (data->quan_table[id]) + 1
b1bcb2
 	 <= next_marker)
b1bcb2
     {