Commit 27274f73 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/x86: Remove the pkey parameter from do_sigbus 



The function do_sigbus never sets si_code to PKUERR so it can never
return a pkey to userspace.  Therefore remove the unusable pkey
parameter from do_sigbus.

Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 768fd9c6

arch/x86/mm/fault.c

+3 −3
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code, 


static void

do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,

	  u32 *pkey, unsigned int fault)

	  unsigned int fault)

{

	struct task_struct *tsk = current;
@@ -995,7 +995,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address, 
		return;

	}

#endif

	force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk, pkey);

	force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk, NULL);

}



static noinline void
@@ -1024,7 +1024,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code, 
	} else {

		if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|

			     VM_FAULT_HWPOISON_LARGE))

			do_sigbus(regs, error_code, address, pkey, fault);

			do_sigbus(regs, error_code, address, fault);

		else if (fault & VM_FAULT_SIGSEGV)

			bad_area_nosemaphore(regs, error_code, address);

		else