redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

signal: Explicitly call force_sig_fault on current

Browse source 
Update the calls of force_sig_fault that pass in a variable that is
set to current earlier to explicitly use current.

This is to make the next change that removes the task parameter
from force_sig_fault easier to verify.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2019-02-07 09:25:08 -06:00
parent ec74e9205e
commit 351b6825b3
14 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/kernel/traps.c
View file

@ -50,7 +50,7 @@ unhandled_exception(const char *str, struct pt_regs *regs,
tsk->thread.fault_address = (__force unsigned int)addr; tsk->thread.fault_address = (__force unsigned int)addr;
force_sig_fault(signo, si_code, addr, tsk); force_sig_fault(signo, si_code, addr, current);
} else { } else {
/* If not due to copy_(to|from)_user, we are doomed */ /* If not due to copy_(to|from)_user, we are doomed */

4
arch/arc/mm/fault.c
View file

@ -202,7 +202,7 @@ bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */ /* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) { if (user_mode(regs)) {
tsk->thread.fault_address = address; tsk->thread.fault_address = address;
force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk); force_sig_fault(SIGSEGV, si_code, (void __user *)address, current);
return; return;
} }
@ -237,5 +237,5 @@ do_sigbus:
goto no_context; goto no_context;
tsk->thread.fault_address = address; tsk->thread.fault_address = address;
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, tsk); force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, current);
} }

2
arch/arm/mm/fault.c
View file

@ -184,7 +184,7 @@ __do_user_fault(unsigned long addr, unsigned int fsr, unsigned int sig,
tsk->thread.address = addr; tsk->thread.address = addr;
tsk->thread.error_code = fsr; tsk->thread.error_code = fsr;
tsk->thread.trap_no = 14; tsk->thread.trap_no = 14;
force_sig_fault(sig, code, (void __user *)addr, tsk); force_sig_fault(sig, code, (void __user *)addr, current);
} }
void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)

4
arch/mips/mm/fault.c
View file

@ -223,7 +223,7 @@ bad_area_nosemaphore:
pr_cont("\n"); pr_cont("\n");
} }
current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f; current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;
force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk); force_sig_fault(SIGSEGV, si_code, (void __user *)address, current);
return; return;
} }
@ -279,7 +279,7 @@ do_sigbus:
#endif #endif
current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f; current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;
tsk->thread.cp0_badvaddr = address; tsk->thread.cp0_badvaddr = address;
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, tsk); force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, current);
return; return;
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT

2
arch/nds32/kernel/traps.c
View file

@ -263,7 +263,7 @@ static void send_sigtrap(struct pt_regs *regs, int error_code, int si_code)
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
force_sig_fault(SIGTRAP, si_code, force_sig_fault(SIGTRAP, si_code,
(void __user *)instruction_pointer(regs), tsk); (void __user *)instruction_pointer(regs), current);
} }
void do_debug_trap(unsigned long entry, unsigned long addr, void do_debug_trap(unsigned long entry, unsigned long addr,

4
arch/nds32/mm/fault.c
View file

@ -271,7 +271,7 @@ bad_area_nosemaphore:
tsk->thread.address = addr; tsk->thread.address = addr;
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = entry; tsk->thread.trap_no = entry;
force_sig_fault(SIGSEGV, si_code, (void __user *)addr, tsk); force_sig_fault(SIGSEGV, si_code, (void __user *)addr, current);
return; return;
} }
@ -340,7 +340,7 @@ do_sigbus:
tsk->thread.address = addr; tsk->thread.address = addr;
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = entry; tsk->thread.trap_no = entry;
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)addr, tsk); force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)addr, current);
return; return;

4
arch/openrisc/mm/fault.c
View file

@ -213,7 +213,7 @@ bad_area_nosemaphore:
/* User mode accesses just cause a SIGSEGV */ /* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) { if (user_mode(regs)) {
force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk); force_sig_fault(SIGSEGV, si_code, (void __user *)address, current);
return; return;
} }
@ -278,7 +278,7 @@ do_sigbus:
* Send a sigbus, regardless of whether we were in kernel * Send a sigbus, regardless of whether we were in kernel
* or user mode. * or user mode.
*/ */
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, tsk); force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, current);
/* Kernel mode? Handle exceptions or die */ /* Kernel mode? Handle exceptions or die */
if (!user_mode(regs)) if (!user_mode(regs))

2
arch/riscv/kernel/traps.c
View file

@ -76,7 +76,7 @@ void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr)
show_regs(regs); show_regs(regs);
} }
force_sig_fault(signo, code, (void __user *)addr, tsk); force_sig_fault(signo, code, (void __user *)addr, current);
} }
static void do_trap_error(struct pt_regs *regs, int signo, int code, static void do_trap_error(struct pt_regs *regs, int signo, int code,

2
arch/sh/math-emu/math.c
View file

@ -560,7 +560,7 @@ static int ieee_fpe_handler(struct pt_regs *regs)
task_thread_info(tsk)->status |= TS_USEDFPU; task_thread_info(tsk)->status |= TS_USEDFPU;
} else { } else {
force_sig_fault(SIGFPE, FPE_FLTINV, force_sig_fault(SIGFPE, FPE_FLTINV,
(void __user *)regs->pc, tsk); (void __user *)regs->pc, current);
} }
regs->pc = nextpc; regs->pc = nextpc;

2
arch/unicore32/mm/fault.c
View file

@ -124,7 +124,7 @@ static void __do_user_fault(unsigned long addr, unsigned int fsr,
tsk->thread.address = addr; tsk->thread.address = addr;
tsk->thread.error_code = fsr; tsk->thread.error_code = fsr;
tsk->thread.trap_no = 14; tsk->thread.trap_no = 14;
force_sig_fault(sig, code, (void __user *)addr, tsk); force_sig_fault(sig, code, (void __user *)addr, current);
} }
void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)

2
arch/x86/kernel/ptrace.c
View file

@ -1369,7 +1369,7 @@ void send_sigtrap(struct pt_regs *regs, int error_code, int si_code)
/* Send us the fake SIGTRAP */ /* Send us the fake SIGTRAP */
force_sig_fault(SIGTRAP, si_code, force_sig_fault(SIGTRAP, si_code,
user_mode(regs) ? (void __user *)regs->ip : NULL, tsk); user_mode(regs) ? (void __user *)regs->ip : NULL, current);
} }
void user_single_step_report(struct pt_regs *regs) void user_single_step_report(struct pt_regs *regs)

4
arch/x86/kernel/traps.c
View file

@ -256,7 +256,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
if (!sicode) if (!sicode)
force_sig(signr); force_sig(signr);
else else
force_sig_fault(signr, sicode, addr, tsk); force_sig_fault(signr, sicode, addr, current);
} }
NOKPROBE_SYMBOL(do_trap); NOKPROBE_SYMBOL(do_trap);
@ -856,7 +856,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
return; return;
force_sig_fault(SIGFPE, si_code, force_sig_fault(SIGFPE, si_code,
(void __user *)uprobe_get_trap_addr(regs), task); (void __user *)uprobe_get_trap_addr(regs), current);
} }
dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code) dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code)

2
arch/x86/kernel/umip.c
View file

@ -277,7 +277,7 @@ static void force_sig_info_umip_fault(void __user *addr, struct pt_regs *regs)
tsk->thread.error_code = X86_PF_USER | X86_PF_WRITE; tsk->thread.error_code = X86_PF_USER | X86_PF_WRITE;
tsk->thread.trap_nr = X86_TRAP_PF; tsk->thread.trap_nr = X86_TRAP_PF;
force_sig_fault(SIGSEGV, SEGV_MAPERR, addr, tsk); force_sig_fault(SIGSEGV, SEGV_MAPERR, addr, current);
if (!(show_unhandled_signals && unhandled_signal(tsk, SIGSEGV))) if (!(show_unhandled_signals && unhandled_signal(tsk, SIGSEGV)))
return; return;

6
arch/x86/mm/fault.c
View file

@ -757,7 +757,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
/* XXX: hwpoison faults will set the wrong code. */ /* XXX: hwpoison faults will set the wrong code. */
force_sig_fault(signal, si_code, (void __user *)address, force_sig_fault(signal, si_code, (void __user *)address,
tsk); current);
} }
/* /*
@ -918,7 +918,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
if (si_code == SEGV_PKUERR) if (si_code == SEGV_PKUERR)
force_sig_pkuerr((void __user *)address, pkey); force_sig_pkuerr((void __user *)address, pkey);
force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk); force_sig_fault(SIGSEGV, si_code, (void __user *)address, current);
return; return;
} }
@ -1044,7 +1044,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
return; return;
} }
#endif #endif
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, tsk); force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, current);
} }
static noinline void static noinline void