diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-02-27 14:57:40 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:51 -0400 |
commit | e3100c82abd9aa643dc15828202aceeae3504e03 (patch) | |
tree | dc4e1b69224a9e795fa9058dcc97c6e77cb71d4d /arch | |
parent | b8c2d3dfbc117dff26058fbac316b8acfc2cb5f7 (diff) |
x86: check physical address range in ioremap
Roland Dreier reported in http://lkml.org/lkml/2008/2/27/194
[ 8425.915139] BUG: unable to handle kernel paging request at ffffc20001a0a000
[ 8425.919087] IP: [<ffffffff8021dacc>] clflush_cache_range+0xc/0x25
[ 8425.919087] PGD 1bf80e067 PUD 1bf80f067 PMD 1bb497067 PTE 80000047000ee17b
This is on a Intel machine with 36bit physical address space. The PTE
entry references 47000ee000, which is outside of it.
Add a check for the physical address space and warn/printk about the
stupid caller.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/ioremap.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 868bbde74698..17f518839028 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -35,6 +35,18 @@ unsigned long __phys_addr(unsigned long x) | |||
35 | } | 35 | } |
36 | EXPORT_SYMBOL(__phys_addr); | 36 | EXPORT_SYMBOL(__phys_addr); |
37 | 37 | ||
38 | static inline int phys_addr_valid(unsigned long addr) | ||
39 | { | ||
40 | return addr < (1UL << boot_cpu_data.x86_phys_bits); | ||
41 | } | ||
42 | |||
43 | #else | ||
44 | |||
45 | static inline int phys_addr_valid(unsigned long addr) | ||
46 | { | ||
47 | return 1; | ||
48 | } | ||
49 | |||
38 | #endif | 50 | #endif |
39 | 51 | ||
40 | int page_is_ram(unsigned long pagenr) | 52 | int page_is_ram(unsigned long pagenr) |
@@ -118,6 +130,13 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size, | |||
118 | if (!size || last_addr < phys_addr) | 130 | if (!size || last_addr < phys_addr) |
119 | return NULL; | 131 | return NULL; |
120 | 132 | ||
133 | if (!phys_addr_valid(phys_addr)) { | ||
134 | printk(KERN_WARNING "ioremap: invalid physical address %lx\n", | ||
135 | phys_addr); | ||
136 | WARN_ON_ONCE(1); | ||
137 | return NULL; | ||
138 | } | ||
139 | |||
121 | /* | 140 | /* |
122 | * Don't remap the low PCI/ISA area, it's always mapped.. | 141 | * Don't remap the low PCI/ISA area, it's always mapped.. |
123 | */ | 142 | */ |