Skip to content

Commit

Permalink
x86: change size if e820_update/remove_range
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Jul 8, 2008
1 parent d86623a commit 232b957
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/x86/kernel/e820.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 232b957

Please sign in to comment.