Commit cd0ea35f authored Feb 12, 2016 by Dave Hansen Committed by Ingo Molnar Feb 18, 2016

signals, pkeys: Notify userspace about protection key faults



A protection key fault is very similar to any other access error.
There must be a VMA, etc...  We even want to take the same action
(SIGSEGV) that we do with a normal access fault.

However, we do need to let userspace know that something is
different.  We do this the same way what we did with SEGV_BNDERR
with Memory Protection eXtensions (MPX): define a new SEGV code:
SEGV_PKUERR.

We add a siginfo field: si_pkey that reveals to userspace which
protection key was set on the PTE that we faulted on.  There is
no other easy way for userspace to figure this out.  They could
parse smaps but that would be a bit cruel.

We share space with in siginfo with _addr_bnd.  #BR faults from
MPX are completely separate from page faults (#PF) that trigger
from protection key violations, so we never need both at the same
time.

Note that _pkey is a 64-bit value.  The current hardware only
supports 4-bit protection keys.  We do this because there is
_plenty_ of space in _sigfault and it is possible that future
processors would support more than 4 bits of protection keys.

The x86 code to actually fill in the siginfo is in the next
patch.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Amanieu d'Antras <amanieu@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20160212210212.3A9B83AC@viggo.jf.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent b376cd02

include/uapi/asm-generic/siginfo.h

+12 −5

Original line number	Diff line number	Diff line
		@@ -91,10 +91,15 @@ typedef struct siginfo {
		int _trapno; /* TRAP # which caused the signal */
		#endif
		short _addr_lsb; /* LSB of the reported address */
		union {
		/* used when si_code=SEGV_BNDERR */
		struct {
		void __user *_lower;
		void __user *_upper;
		} _addr_bnd;
		/* used when si_code=SEGV_PKUERR */
		u64 _pkey;
		};
		} _sigfault;

		/* SIGPOLL */
		@@ -137,6 +142,7 @@ typedef struct siginfo {
		#define si_addr_lsb _sifields._sigfault._addr_lsb
		#define si_lower _sifields._sigfault._addr_bnd._lower
		#define si_upper _sifields._sigfault._addr_bnd._upper
		#define si_pkey _sifields._sigfault._pkey
		#define si_band _sifields._sigpoll._band
		#define si_fd _sifields._sigpoll._fd
		#ifdef __ARCH_SIGSYS
		@@ -206,7 +212,8 @@ typedef struct siginfo {
		#define SEGV_MAPERR (__SI_FAULT\|1) /* address not mapped to object */
		#define SEGV_ACCERR (__SI_FAULT\|2) /* invalid permissions for mapped object */
		#define SEGV_BNDERR (__SI_FAULT\|3) /* failed address bound checks */
		#define NSIGSEGV 3
		#define SEGV_PKUERR (__SI_FAULT\|4) /* failed protection key checks */
		#define NSIGSEGV 4

		/*
		* SIGBUS si_codes

kernel/signal.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2708,6 +2708,10 @@ int copy_siginfo_to_user(siginfo_t __user to, const siginfo_t from)
		err \|= __put_user(from->si_lower, &to->si_lower);
		err \|= __put_user(from->si_upper, &to->si_upper);
		}
		#endif
		#ifdef SEGV_PKUERR
		if (from->si_signo == SIGSEGV && from->si_code == SEGV_PKUERR)
		err \|= __put_user(from->si_pkey, &to->si_pkey);
		#endif
		break;
		case __SI_CHLD:

Admin message