diff options
author | Alan Cox <alan@redhat.com> | 2008-10-10 05:46:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:19:04 -0400 |
commit | c613ec1a7ff3714da11c7c48a13bab03beb5c376 (patch) | |
tree | 4e6cc1466bcd1e5b420c29ad9652c0a2893c150f /arch | |
parent | e1e23bb0513520035ec934fa3483507cb6648b7c (diff) |
x86, early_ioremap: fix fencepost error
The x86 implementation of early_ioremap has an off by one error. If we get
an object which ends on the first byte of a page we undermap by one page and
this causes a crash on boot with the ASUS P5QL whose DMI table happens to fit
this alignment.
The size computation is currently
last_addr = phys_addr + size - 1;
npages = (PAGE_ALIGN(last_addr) - phys_addr)
(Consider a request for 1 byte at alignment 0...)
Closes #11693
Debugging work by Ian Campbell/Felix Geyer
Signed-off-by: Alan Cox <alan@rehat.com>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 6ab3196d12b4..10b52309aefd 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -614,7 +614,7 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size) | |||
614 | */ | 614 | */ |
615 | offset = phys_addr & ~PAGE_MASK; | 615 | offset = phys_addr & ~PAGE_MASK; |
616 | phys_addr &= PAGE_MASK; | 616 | phys_addr &= PAGE_MASK; |
617 | size = PAGE_ALIGN(last_addr) - phys_addr; | 617 | size = PAGE_ALIGN(last_addr + 1) - phys_addr; |
618 | 618 | ||
619 | /* | 619 | /* |
620 | * Mappings have to fit in the FIX_BTMAP area. | 620 | * Mappings have to fit in the FIX_BTMAP area. |