powerpc: Deliver SEGV signal on pkey violation
RFC v7 24/25 powerpc: Deliver SEGV signal on pkey violation
The value of the AMR register at the time of exception is made available in gp_regs[PT_AMR] of the siginfo.
The value of the pkey, whose protection got violated, is made available in si_pkey field of the siginfo structure.
Signed-off-by Ram Pai <[email protected]>
--- arch/powerpc/include/uapi/asm/ptrace.h | 1 + arch/powerpc/kernel/signal_32.c | 5 +++++ arch/powerpc/kernel/signal_64.c | 4 ++++ arch/powerpc/kernel/traps.c | 15 +++++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-)
arch/powerpc/include/uapi/asm/ptrace.h +1 -0
@@ -110,6 +110,7 @@ struct pt_regs {#define PT_RESULT 43#define PT_DSCR 44#define PT_REGS_COUNT 44 +#define PT_AMR 45#define PT_FPR0 48/* each FP reg occupies 2 slots in this space */
arch/powerpc/kernel/signal_32.c +5 -0
@@ -500,6 +500,11 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, (unsigned long) &frame->tramp[2]); } +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS +if (__put_user (get_paca ()->paca_amr, &frame->mc_gregs[PT_AMR ])) +return 1 ; +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ +return 0 ; }
arch/powerpc/kernel/signal_64.c +4 -0
@@ -174,6 +174,10 @@ static long setup_sigcontext(struct sigcontext __user *sc,if (set !=NULL ) err |=__put_user (set->sig[0 ], &sc->oldmask); +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS + err |=__put_user (get_paca ()->paca_amr, &sc->gp_regs[PT_AMR ]); +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ +return err; }
arch/powerpc/kernel/traps.c +15 -0
@@ -20,6 +20,7 @@#include <linux/sched/debug.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/pkeys.h> #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h>
@@ -247,6 +248,15 @@ void user_single_step_siginfo(struct task_struct *tsk, info->si_addr = (void __user *)regs->nip; } +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS +static void fill_sig_info_pkey (int si_code,siginfo_t *info,unsigned long addr) +{ +if (si_code !=SEGV_PKUERR ) +return ; + info->si_pkey =get_paca ()->paca_pkey; +} +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ +void _exception (int signr,struct pt_regs *regs,int code,unsigned long addr) {siginfo_t info;
@@ -274,6 +284,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) info.si_signo = signr; info.si_code = code; info.si_addr = (void __user *) addr; + +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS +fill_sig_info_pkey (code, &info, addr); +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ +force_sig_info (signr, &info, current); }
Signature · 1 line
1.7.1