signal/parisc: Use force_sig_mceerr where appropriate (c2b0e0d3) · Commits · 戴 / test

In do_page_fault where an mceerr is generated stop and call force_sig_mceerr. Keeping the mcerr handling logic out of the force_sig_info call below. This ensures that only and always in the mcerr case is lsb interesting. This ensures setting set si_lsb in the future won't accidentally stomp another siginfo field in the non mcerr case. Cc: James Bottomley <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Acked-by: Helge Deller <deller@gmx.de> # parisc Signed-off-by:

"Eric W. Biederman" <ebiederm@xmission.com>

arch/parisc/mm/fault.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -354,7 +354,6 @@ bad_area:

		if (user_mode(regs)) {
		struct siginfo si;
		unsigned int lsb = 0;

		clear_siginfo(&si);
		switch (code) {
		@@ -391,14 +390,10 @@ bad_area:

		#ifdef CONFIG_MEMORY_FAILURE
		if (fault & (VM_FAULT_HWPOISON\|VM_FAULT_HWPOISON_LARGE)) {
		unsigned int lsb = 0;
		printk(KERN_ERR
		"MCE: Killing %s:%d due to hardware memory corruption fault at %08lx\n",
		tsk->comm, tsk->pid, address);
		si.si_signo = SIGBUS;
		si.si_code = BUS_MCEERR_AR;
		}
		#endif

		/*
		* Either small page or large page may be poisoned.
		* In other words, VM_FAULT_HWPOISON_LARGE and
		@@ -408,9 +403,14 @@ bad_area:
		lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));
		else if (fault & VM_FAULT_HWPOISON)
		lsb = PAGE_SHIFT;
		else

		force_sig_mceerr(BUS_MCEERR_AR, (void __user *) address,
		lsb, current);
		return;
		}
		#endif

		show_signal_msg(regs, code, address, tsk, vma);
		si.si_addr_lsb = lsb;

		si.si_errno = 0;
		si.si_addr = (void __user *) address;

Admin message