summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rusev <arusev@ru.mvista.com>2008-02-26 18:42:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-29 22:47:20 +0000
commit9ae3ae0bebb9a3a348dc233229008b126014889d (patch)
tree84d6277d5e84576cc47fd815828352de99d3068f
parentc710e39cbec4f3d60acd07f5356404a61bc1959a (diff)
downloadlinux-3.10-9ae3ae0bebb9a3a348dc233229008b126014889d.tar.gz
linux-3.10-9ae3ae0bebb9a3a348dc233229008b126014889d.tar.bz2
linux-3.10-9ae3ae0bebb9a3a348dc233229008b126014889d.zip
[ARM] 4839/1: fixes kernel Oops in /dev/mem device driver for memory map with PHYS_OFF
"cat /dev/mem" may cause kernel Oops for boards with PHYS_OFFSET != 0 because character device is mapped to addresses starting from zero and there is no protection against such situation. Patch just add this. Signed-off-by: Alexandre Rusev <arusev@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/mmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 2728b0e7d2b..3f6dc40b835 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -120,6 +120,8 @@ full_search:
*/
int valid_phys_addr_range(unsigned long addr, size_t size)
{
+ if (addr < PHYS_OFFSET)
+ return 0;
if (addr + size > __pa(high_memory))
return 0;