From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 24 Jun 2008 21:58:38 +0000 (-0700)
Subject: x86: change size if e820_update/remove_range
X-Git-Tag: v2.6.27-rc1~1106^2~169
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=232b957ae93973a5f8619ef61b916744b747478c;p=linux-2.6-omap-h63xx.git

x86: change size if e820_update/remove_range

in case someone using crazy parameter while calling them.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 15b4393ff9b..1b76b25b4d9 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -405,6 +405,9 @@ u64 __init e820_update_range(u64 start, u64 size, unsigned old_type,
 
 	BUG_ON(old_type == new_type);
 
+	if (size > (ULLONG_MAX - start))
+		size = ULLONG_MAX - start;
+
 	for (i = 0; i < e820.nr_map; i++) {
 		struct e820entry *ei = &e820.map[i];
 		u64 final_start, final_end;
@@ -441,6 +444,9 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,
 	int i;
 	u64 real_removed_size = 0;
 
+	if (size > (ULLONG_MAX - start))
+		size = ULLONG_MAX - start;
+
 	for (i = 0; i < e820.nr_map; i++) {
 		struct e820entry *ei = &e820.map[i];
 		u64 final_start, final_end;