Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5871aa6d authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] i386: Fix overflow in e820_all_mapped 



The 32bit version of e820_all_mapped() needs to use u64 to avoid overflows on
PAE systems.  Pointed out by Jan Beulich

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 32828546

arch/i386/kernel/setup.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -970,8 +970,10 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg) 
  * not-overlapping, which is the case

  * not-overlapping, which is the case

  */

  */

int __init

int __init

e820_all_mapped(unsigned long start, unsigned long end, unsigned type)

e820_all_mapped(unsigned long s, unsigned long e, unsigned type)

{

{

	u64 start = s;

	u64 end = e;

	int i;

	int i;

	for (i = 0; i < e820.nr_map; i++) {

	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];

		struct e820entry *ei = &e820.map[i];