Pārlūkot izejas kodu

device_tree: Fix integer overflowing in load_device_tree()

If the value of get_image_size() exceeds INT_MAX / 2 - 10000, the
computation of @dt_size overflows to a negative number, which then
gets converted to a very large size_t for g_malloc0() and
load_image_size().  In the (fortunately improbable) case g_malloc0()
succeeds and load_image_size() survives, we'd assign the negative
number to *sizep.  What that would do to the callers I can't say, but
it's unlikely to be good.

Fix by rejecting images whose size would overflow.

Reported-by: Kurtis Miller <kurtis.miller@nccgroup.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <2019040917.25798-1-armbru@redhat.com>
tags/v4.0.0-rc3
Markus Armbruster 3 mēnešus atpakaļ
vecāks
revīzija
065e6298a7
1 mainītis faili ar 4 papildinājumiem un 0 dzēšanām
  1. 4
    0
      device_tree.c

+ 4
- 0
device_tree.c Parādīt failu

@@ -84,6 +84,10 @@ void *load_device_tree(const char *filename_path, int *sizep)
84 84
                      filename_path);
85 85
         goto fail;
86 86
     }
87
+    if (dt_size > INT_MAX / 2 - 10000) {
88
+        error_report("Device tree file '%s' is too large", filename_path);
89
+        goto fail;
90
+    }
87 91
 
88 92
     /* Expand to 2x size to give enough room for manipulation.  */
89 93
     dt_size += 10000;

Notiek ielāde…
Atcelt
Saglabāt