Commit 768fd9c6 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/x86: Remove pkey parameter from bad_area_nosemaphore 



The function bad_area_nosemaphore always sets si_code to SEGV_MAPERR
and as such can never return a pkey parameter.  Therefore remove the
unusable pkey parameter from bad_area_nosemaphore.

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

arch/x86/mm/fault.c

+7 −7
Original line number Diff line number Diff line
@@ -897,9 +897,9 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, 


static noinline void

bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,

		     unsigned long address, u32 *pkey)

		     unsigned long address)

{

	__bad_area_nosemaphore(regs, error_code, address, pkey, SEGV_MAPERR);

	__bad_area_nosemaphore(regs, error_code, address, NULL, SEGV_MAPERR);

}



static void
@@ -1026,7 +1026,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code, 
			     VM_FAULT_HWPOISON_LARGE))

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

		else if (fault & VM_FAULT_SIGSEGV)

			bad_area_nosemaphore(regs, error_code, address, pkey);

			bad_area_nosemaphore(regs, error_code, address);

		else

			BUG();

	}
@@ -1256,7 +1256,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
		 * Don't take the mm semaphore here. If we fixup a prefetch

		 * fault we could otherwise deadlock:

		 */

		bad_area_nosemaphore(regs, error_code, address, NULL);

		bad_area_nosemaphore(regs, error_code, address);



		return;

	}
@@ -1269,7 +1269,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
		pgtable_bad(regs, error_code, address);



	if (unlikely(smap_violation(error_code, regs))) {

		bad_area_nosemaphore(regs, error_code, address, NULL);

		bad_area_nosemaphore(regs, error_code, address);

		return;

	}
@@ -1278,7 +1278,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
	 * in a region with pagefaults disabled then we must not take the fault

	 */

	if (unlikely(faulthandler_disabled() || !mm)) {

		bad_area_nosemaphore(regs, error_code, address, NULL);

		bad_area_nosemaphore(regs, error_code, address);

		return;

	}
@@ -1324,7 +1324,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, 
	if (unlikely(!down_read_trylock(&mm->mmap_sem))) {

		if (!(error_code & X86_PF_USER) &&

		    !search_exception_tables(regs->ip)) {

			bad_area_nosemaphore(regs, error_code, address, NULL);

			bad_area_nosemaphore(regs, error_code, address);

			return;

		}

retry: