diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-09-16 05:50:22 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-25 05:25:26 -0400 |
commit | 51635ad282ead58b9d164f07e1fb62a9456b427c (patch) | |
tree | a7d9fb162d09aaf02da3dee89520b10c07d92c8b /include/asm-arm/io.h | |
parent | bf11d26cb96fe8221ef056eedab692e91634cc65 (diff) |
[ARM] 3813/1: prevent >= 4G /dev/mem mmap()
Prevent userland from mapping in physical address regions >= 4G by
checking for that in valid_mmap_phys_addr_range().
Unfortunately, we cannot override valid_mmap_phys_addr_range() without
also overriding valid_phys_addr_range(), so copy drivers/char/mem.c's
version of valid_phys_addr_range() over to arch/arm/mm/mmap.c as well.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/io.h')
-rw-r--r-- | include/asm-arm/io.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index bf7b9dea30f1..8076a85c3675 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
@@ -280,6 +280,10 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); | |||
280 | #define BIOVEC_MERGEABLE(vec1, vec2) \ | 280 | #define BIOVEC_MERGEABLE(vec1, vec2) \ |
281 | ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) | 281 | ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) |
282 | 282 | ||
283 | #define ARCH_HAS_VALID_PHYS_ADDR_RANGE | ||
284 | extern int valid_phys_addr_range(unsigned long addr, size_t size); | ||
285 | extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); | ||
286 | |||
283 | /* | 287 | /* |
284 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | 288 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem |
285 | * access | 289 | * access |