* SIGSEGV on OSPKE machine
@ 2018-03-16 21:36 Shakeel Butt
0 siblings, 0 replies; only message in thread
From: Shakeel Butt @ 2018-03-16 21:36 UTC (permalink / raw)
To: Thomas Gleixner, Greg Thelen, Ingo Molnar, H. Peter Anvin,
John Sperbeck, Andrew Morton
Cc: linux-mm, linux-kernel, x86, Shakeel Butt
Hi all,
The following simple program is producing SIGSEGV on machines which have
X86_FEATURE_OSPKE feature on 4.15 kernel.
#include <sys/mman.h>
int main(int argc, char *argv[])
{
void *p = mmap(0, 4096, PROT_EXEC, MAP_ANONYMOUS|MAP_PRIVATE,
-1, 0);
mprotect(p, 4096, PROT_NONE);
mprotect(p, 4096, PROT_READ);
(void)*(volatile unsigned char *)p;
}
On further inspection it seems like transition from PROT_EXEC to
PROT_NONE leaves the exec-only pkey lingering in the vma flags. That
is, new_vma_pkey is non-zero in do_mprotect_pkey(). Later, then
enabling PROT_READ, the pkey remains and overrides the normal page
protections.
This change seems to help but is this the right way to solve it?
---
arch/x86/mm/pkeys.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/mm/pkeys.c b/arch/x86/mm/pkeys.c
index d7bc0eea20a5..4a837a220516 100644
--- a/arch/x86/mm/pkeys.c
+++ b/arch/x86/mm/pkeys.c
@@ -94,6 +94,10 @@ int __arch_override_mprotect_pkey(struct vm_area_struct *vma, int prot, int pkey
*/
if (pkey != -1)
return pkey;
+
+ if ((prot & (PROT_READ|PROT_WRITE|PROT_EXEC)) == 0)
+ return 0;
+
/*
* Look for a protection-key-drive execute-only mapping
* which is now being given permissions that are not
--
2.16.2.804.g6dcf76e118-goog
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-03-16 21:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-16 21:36 SIGSEGV on OSPKE machine Shakeel Butt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).