summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorT Makphaibulchoke <tmac@hp.com>2012-08-29 05:21:43 +0200
committerIngo Molnar <mingo@kernel.org>2012-09-13 17:35:54 +0200
commit73e8f3d7e2cb23614d5115703d76d8e54764b641 (patch)
treec7edef261d3ea49550801297a98b5890493252e1
parentx86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB (diff)
downloadlinux-73e8f3d7e2cb23614d5115703d76d8e54764b641.tar.xz
linux-73e8f3d7e2cb23614d5115703d76d8e54764b641.zip
x86/mm/init.c: Fix devmem_is_allowed() off by one
Fixing an off-by-one error in devmem_is_allowed(), which allows accesses to physical addresses 0x100000-0x100fff, an extra page past 1MB. Signed-off-by: T Makphaibulchoke <tmac@hp.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Cc: yinghai@kernel.org Cc: tiwai@suse.de Cc: dhowells@redhat.com Link: http://lkml.kernel.org/r/1346210503-14276-1-git-send-email-tmac@hp.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index e0e6990723e9..ab1f6a93b527 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -319,7 +319,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
*/
int devmem_is_allowed(unsigned long pagenr)
{
- if (pagenr <= 256)
+ if (pagenr < 256)
return 1;
if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
return 0;