Commit 6d7942dc authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: fix 64k corruption-check

Impact: fix boot crash

Need to exit early if the addr is far above 64k.

The crash got exposed by:

  78a8b35: x86: make e820_update_range() handle small range update
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: <stable@kernel.org>
LKML-Reference: <49BC2279.2030101@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 78a8b35b
...@@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void) ...@@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void)
if (!(addr + 1)) if (!(addr + 1))
break; break;
if (addr >= corruption_check_size)
break;
if ((addr + size) > corruption_check_size) if ((addr + size) > corruption_check_size)
size = corruption_check_size - addr; size = corruption_check_size - addr;
if (size == 0)
break;
e820_update_range(addr, size, E820_RAM, E820_RESERVED); e820_update_range(addr, size, E820_RAM, E820_RESERVED);
scan_areas[num_scan_areas].addr = addr; scan_areas[num_scan_areas].addr = addr;
scan_areas[num_scan_areas].size = size; scan_areas[num_scan_areas].size = size;
......
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