diff options
| author | John David Anglin <dave.anglin@bell.net> | 2013-02-02 23:44:59 +0000 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-02-20 22:50:50 +0100 |
| commit | 5ca8b91df88fa417aa7aac19494a8ae1602db2cb (patch) | |
| tree | 513cd4f4cad27094c110ef9a2bd92b6d0847429e /arch | |
| parent | 027f27c4eca00b4411fb1fe61c33060569ff73f6 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/sys_parisc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index f76c10863c6..a047b3227e5 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; |