Commit ab74d00a authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Rob Herring

of: Fix crash if an earlycon driver is not found

__earlycon_of_table_sentinel.compatible is a char[128], not a pointer, so
it will never be NULL.  Checking it against NULL causes the match loop to
run past the end of the array, and eventually match a bogus entry, under
the following conditions:

 - Kernel command line specifies "earlycon" with no parameters
 - DT has a stdout-path pointing to a UART node
 - The UART driver doesn't use OF_EARLYCON_DECLARE (or maybe the console
   driver is compiled out)

Fix this by checking to see if match->compatible is a non-empty string.
Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Cc: <stable@vger.kernel.org> # 3.16+
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 66865de4
...@@ -773,7 +773,7 @@ int __init early_init_dt_scan_chosen_serial(void) ...@@ -773,7 +773,7 @@ int __init early_init_dt_scan_chosen_serial(void)
if (offset < 0) if (offset < 0)
return -ENODEV; return -ENODEV;
while (match->compatible) { while (match->compatible[0]) {
unsigned long addr; unsigned long addr;
if (fdt_node_check_compatible(fdt, offset, match->compatible)) { if (fdt_node_check_compatible(fdt, offset, match->compatible)) {
match++; match++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment