aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/syscalls.c3
-rw-r--r--include/asm-powerpc/mman.h30
2 files changed, 33 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 4fe69ca24481..c04832c4a02e 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -143,6 +143,9 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
143 struct file * file = NULL; 143 struct file * file = NULL;
144 unsigned long ret = -EINVAL; 144 unsigned long ret = -EINVAL;
145 145
146 if (!arch_validate_prot(prot))
147 goto out;
148
146 if (shift) { 149 if (shift) {
147 if (off & ((1 << shift) - 1)) 150 if (off & ((1 << shift) - 1))
148 goto out; 151 goto out;
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h
index 0c46bf2c7d5f..f8a32e20ba04 100644
--- a/include/asm-powerpc/mman.h
+++ b/include/asm-powerpc/mman.h
@@ -1,7 +1,9 @@
1#ifndef _ASM_POWERPC_MMAN_H 1#ifndef _ASM_POWERPC_MMAN_H
2#define _ASM_POWERPC_MMAN_H 2#define _ASM_POWERPC_MMAN_H
3 3
4#include <asm/cputable.h>
4#include <asm-generic/mman.h> 5#include <asm-generic/mman.h>
6#include <linux/mm.h>
5 7
6/* 8/*
7 * This program is free software; you can redistribute it and/or 9 * This program is free software; you can redistribute it and/or
@@ -26,4 +28,32 @@
26#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ 28#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
27#define MAP_NONBLOCK 0x10000 /* do not block on IO */ 29#define MAP_NONBLOCK 0x10000 /* do not block on IO */
28 30
31#ifdef CONFIG_PPC64
32/*
33 * This file is included by linux/mman.h, so we can't use cacl_vm_prot_bits()
34 * here. How important is the optimization?
35 */
36static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
37{
38 return (prot & PROT_SAO) ? VM_SAO : 0;
39}
40#define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
41
42static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
43{
44 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : 0;
45}
46#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)
47
48static inline int arch_validate_prot(unsigned long prot)
49{
50 if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_SAO))
51 return 0;
52 if ((prot & PROT_SAO) && !cpu_has_feature(CPU_FTR_SAO))
53 return 0;
54 return 1;
55}
56#define arch_validate_prot(prot) arch_validate_prot(prot)
57
58#endif /* CONFIG_PPC64 */
29#endif /* _ASM_POWERPC_MMAN_H */ 59#endif /* _ASM_POWERPC_MMAN_H */