Skip to content

Commit 065e629

Browse files
Markus Armbrusteralistair23
Markus Armbruster
authored andcommitted
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 <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Alistair Francis <[email protected]> Message-Id: <[email protected]>
1 parent f151f8a commit 065e629

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

device_tree.c

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ void *load_device_tree(const char *filename_path, int *sizep)
8484
filename_path);
8585
goto fail;
8686
}
87+
if (dt_size > INT_MAX / 2 - 10000) {
88+
error_report("Device tree file '%s' is too large", filename_path);
89+
goto fail;
90+
}
8791

8892
/* Expand to 2x size to give enough room for manipulation. */
8993
dt_size += 10000;

0 commit comments

Comments
 (0)