[tip:x86/urgent] x86/mm/init.c: Fix devmem_is_allowed() off by one

From: tip-bot for T Makphaibulchoke
Date: Fri Sep 14 2012 - 02:20:47 EST


Commit-ID: 73e8f3d7e2cb23614d5115703d76d8e54764b641
Gitweb: http://git.kernel.org/tip/73e8f3d7e2cb23614d5115703d76d8e54764b641
Author: T Makphaibulchoke <tmac@xxxxxx>
AuthorDate: Tue, 28 Aug 2012 21:21:43 -0600
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 13 Sep 2012 17:35:54 +0200

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@xxxxxx>
Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: yinghai@xxxxxxxxxx
Cc: tiwai@xxxxxxx
Cc: dhowells@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1346210503-14276-1-git-send-email-tmac@xxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/mm/init.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index e0e6990..ab1f6a9 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/