proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-16 14:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc: check key protection for user page access

Browse Source 
Make sure that the kernel does not access user pages without
checking their key-protection.

Signed-off-by: Ram Pai <linuxram@us.ibm.com>
[mpe: Integrate with upstream version of pte_access_permitted()]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Ram Pai 2018-01-18 17:50:38 -08:00 committed by Michael Ellerman
parent f2407ef3ba
commit bca7aacfe8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/book3s/64/pgtable.h
View File

@ -571,7 +571,14 @@ static inline int pte_present(pte_t pte)
return !!(pte_raw(pte) & cpu_to_be64(_PAGE_PRESENT)); return !!(pte_raw(pte) & cpu_to_be64(_PAGE_PRESENT));
} }
#ifdef CONFIG_PPC_MEM_KEYS
extern bool arch_pte_access_permitted(u64 pte, bool write, bool execute); extern bool arch_pte_access_permitted(u64 pte, bool write, bool execute);
#else
static inline bool arch_pte_access_permitted(u64 pte, bool write, bool execute)
{
return true;
}
#endif /* CONFIG_PPC_MEM_KEYS */
#define pte_access_permitted pte_access_permitted #define pte_access_permitted pte_access_permitted
static inline bool pte_access_permitted(pte_t pte, bool write) static inline bool pte_access_permitted(pte_t pte, bool write)
@ -593,7 +600,8 @@ static inline bool pte_access_permitted(pte_t pte, bool write)
if ((pteval & clear_pte_bits) == clear_pte_bits) if ((pteval & clear_pte_bits) == clear_pte_bits)
return false; return false;
return true;
return arch_pte_access_permitted(pte_val(pte), write, 0);
} }
/* /*