File 0013-video-readers-jpeg-Do-not-reallocate-a-giv... of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File 0013-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch of Package grub2 (Revision 4ba9ab36da5efc943a03b7dcebebf930)

Currently displaying revision 4ba9ab36da5efc943a03b7dcebebf930 , Show latest

From 8f8282090a1d1469bffd0db6a07275882628caeb Mon Sep 17 00:00:00 2001
From: Daniel Axtens <dja@axtens.net>
Date: Mon, 28 Jun 2021 14:16:58 +1000
Subject: [PATCH 13/32] video/readers/jpeg: Do not reallocate a given huff
 table

Fix a memory leak where an invalid file could cause us to reallocate
memory for a huffman table we had already allocated memory for.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 grub-core/video/readers/jpeg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
index 10225abd53..caa211f06d 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -245,6 +245,9 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
 	n += count[i];
 
       id += ac * 2;
+      if (data->huff_value[id] != NULL)
+	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
+			   "jpeg: attempt to reallocate huffman table");
       data->huff_value[id] = grub_malloc (n);
       if (grub_errno)
 	return grub_errno;
-- 
2.34.1

Places

File 0013-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch of Package grub2 (Revision 4ba9ab36da5efc943a03b7dcebebf930)

Places