openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

signal/powerpc: Use force_sig_mceerr as appropriate 

In do_sigbus isolate the mceerr signaling code and call
force_sig_mceerr instead of falling through to the force_sig_info that
works for all of the other signals.

Reviewed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2018-04-19 17:36:43 -05:00
parent 0a996c1a3f
commit f654fc07db
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/mm/fault.c
View File

@ -158,7 +158,6 @@ static int do_sigbus(struct pt_regs *regs, unsigned long address,
vm_fault_t fault) vm_fault_t fault)
{ {
siginfo_t info; siginfo_t info;
unsigned int lsb = 0;
if (!user_mode(regs)) if (!user_mode(regs))
return SIGBUS; return SIGBUS;
@ -171,17 +170,22 @@ static int do_sigbus(struct pt_regs *regs, unsigned long address,
info.si_addr = (void __user *)address; info.si_addr = (void __user *)address;
#ifdef CONFIG_MEMORY_FAILURE #ifdef CONFIG_MEMORY_FAILURE
if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) { if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
unsigned int lsb = 0; /* shutup gcc */
pr_err("MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n", pr_err("MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
current->comm, current->pid, address); current->comm, current->pid, address);
info.si_code = BUS_MCEERR_AR;
if (fault & VM_FAULT_HWPOISON_LARGE)
lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));
if (fault & VM_FAULT_HWPOISON)
lsb = PAGE_SHIFT;
force_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb,
current);
return 0;
} }
if (fault & VM_FAULT_HWPOISON_LARGE)
lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));
if (fault & VM_FAULT_HWPOISON)
lsb = PAGE_SHIFT;
#endif #endif
info.si_addr_lsb = lsb;
force_sig_info(SIGBUS, &info, current); force_sig_info(SIGBUS, &info, current);
return 0; return 0;
} }