summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/check.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-03-14 14:32:41 -0700
committerIngo Molnar <mingo@elte.hu>2009-03-15 07:03:15 +0100
commit6d7942dc2a70a7e74c352107b150265602671588 (patch)
treef7df27a6e206061fcdecf2df71e46824098386b7 /arch/x86/kernel/check.c
parent78a8b35bc7abf8b8333d6f625e08c0f7cc1c3742 (diff)
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: Yinghai Lu <yinghai@kernel.org> Cc: <stable@kernel.org> LKML-Reference: <49BC2279.2030101@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/check.c')
-rw-r--r--arch/x86/kernel/check.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c
index b617b1164f1e..fc999e6fc46a 100644
--- a/arch/x86/kernel/check.c
+++ b/arch/x86/kernel/check.c
@@ -86,12 +86,12 @@ void __init setup_bios_corruption_check(void)
if (!(addr + 1))
break;
+ if (addr >= corruption_check_size)
+ break;
+
if ((addr + size) > corruption_check_size)
size = corruption_check_size - addr;
- if (size == 0)
- break;
-
e820_update_range(addr, size, E820_RAM, E820_RESERVED);
scan_areas[num_scan_areas].addr = addr;
scan_areas[num_scan_areas].size = size;