mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-01 18:24:23 +08:00
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: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
e9a0650911
commit
fd65cc848e
@ -157,10 +157,11 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
|
|||||||
* User mode accesses just cause a SIGSEGV
|
* User mode accesses just cause a SIGSEGV
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
__do_user_fault(struct task_struct *tsk, unsigned long addr,
|
__do_user_fault(unsigned long addr, unsigned int fsr, unsigned int sig,
|
||||||
unsigned int fsr, unsigned int sig, int code,
|
int code, struct pt_regs *regs)
|
||||||
struct pt_regs *regs)
|
|
||||||
{
|
{
|
||||||
|
struct task_struct *tsk = current;
|
||||||
|
|
||||||
if (addr > TASK_SIZE)
|
if (addr > TASK_SIZE)
|
||||||
harden_branch_predictor();
|
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.
|
* have no context to handle this fault with.
|
||||||
*/
|
*/
|
||||||
if (user_mode(regs))
|
if (user_mode(regs))
|
||||||
__do_user_fault(tsk, addr, fsr, SIGSEGV, SEGV_MAPERR, regs);
|
__do_user_fault(addr, fsr, SIGSEGV, SEGV_MAPERR, regs);
|
||||||
else
|
else
|
||||||
__do_kernel_fault(mm, addr, fsr, regs);
|
__do_kernel_fault(mm, addr, fsr, regs);
|
||||||
}
|
}
|
||||||
@ -392,7 +393,7 @@ retry:
|
|||||||
SEGV_ACCERR : SEGV_MAPERR;
|
SEGV_ACCERR : SEGV_MAPERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
__do_user_fault(tsk, addr, fsr, sig, code, regs);
|
__do_user_fault(addr, fsr, sig, code, regs);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
no_context:
|
no_context:
|
||||||
|
Loading…
Reference in New Issue
Block a user