From: John David Anglin <dave.anglin@bell.net>
Date: Sat, 2 Feb 2013 23:44:59 +0000 (+0000)
Subject: parisc: ensure that mmapped shared pages are aligned at SHMLBA addresses
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ca8b91df88fa417aa7aac19494a8ae1602db2cb;p=linux-beck.git

parisc: ensure that mmapped shared pages are aligned at SHMLBA addresses

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index f76c10863c62..a047b3227e50 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -94,11 +94,12 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 {
 	if (len > TASK_SIZE)
 		return -ENOMEM;
-	/* Might want to check for cache aliasing issues for MAP_FIXED case
-	 * like ARM or MIPS ??? --BenH.
-	 */
-	if (flags & MAP_FIXED)
+	if (flags & MAP_FIXED) {
+		if ((flags & MAP_SHARED) &&
+		    (addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))
+			return -EINVAL;
 		return addr;
+	}
 	if (!addr)
 		addr = TASK_UNMAPPED_BASE;