Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

signal/arm: Remove tsk parameter from __do_user_fault 



The __do_user_fault function is always called with tsk == current.
Make that obvious by removing the tsk parameter.

This makes it clear that __do_user_fault calls force_sig_fault
on the current task.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent e9a06509

arch/arm/mm/fault.c

+6 −5
Original line number Diff line number Diff line
@@ -157,10 +157,11 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, 
 * User mode accesses just cause a SIGSEGV

 */

static void

__do_user_fault(struct task_struct *tsk, unsigned long addr,

		unsigned int fsr, unsigned int sig, int code,

		struct pt_regs *regs)

__do_user_fault(unsigned long addr, unsigned int fsr, unsigned int sig,

		int code, struct pt_regs *regs)

{

	struct task_struct *tsk = current;



	if (addr > TASK_SIZE)

		harden_branch_predictor();
@@ -196,7 +197,7 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	 * have no context to handle this fault with.

	 */

	if (user_mode(regs))

		__do_user_fault(tsk, addr, fsr, SIGSEGV, SEGV_MAPERR, regs);

		__do_user_fault(addr, fsr, SIGSEGV, SEGV_MAPERR, regs);

	else

		__do_kernel_fault(mm, addr, fsr, regs);

}
@@ -392,7 +393,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
			SEGV_ACCERR : SEGV_MAPERR;

	}



	__do_user_fault(tsk, addr, fsr, sig, code, regs);

	__do_user_fault(addr, fsr, sig, code, regs);

	return 0;



no_context: