aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/fault.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2018-04-17 16:26:37 -0400
committerEric W. Biederman <ebiederm@xmission.com>2018-04-25 11:40:51 -0400
commit3eb0f5193b497083391aa05d35210d5645211eef (patch)
tree65f009d4cdd5e407741a4431c0aacd40452779bd /arch/arm/mm/fault.c
parentf6ed1ecad56fec7ab5c6bf741064b95801e9688f (diff)
signal: Ensure every siginfo we send has all bits initialized
Call clear_siginfo to ensure every stack allocated siginfo is properly initialized before being passed to the signal sending functions. Note: It is not safe to depend on C initializers to initialize struct siginfo on the stack because C is allowed to skip holes when initializing a structure. The initialization of struct siginfo in tracehook_report_syscall_exit was moved from the helper user_single_step_siginfo into tracehook_report_syscall_exit itself, to make it clear that the local variable siginfo gets fully initialized. In a few cases the scope of struct siginfo has been reduced to make it clear that siginfo siginfo is not used on other paths in the function in which it is declared. Instances of using memset to initialize siginfo have been replaced with calls clear_siginfo for clarity. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/arm/mm/fault.c')
-rw-r--r--arch/arm/mm/fault.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index b75eada23d0a..32034543f49c 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -163,6 +163,8 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
163{ 163{
164 struct siginfo si; 164 struct siginfo si;
165 165
166 clear_siginfo(&si);
167
166#ifdef CONFIG_DEBUG_USER 168#ifdef CONFIG_DEBUG_USER
167 if (((user_debug & UDBG_SEGV) && (sig == SIGSEGV)) || 169 if (((user_debug & UDBG_SEGV) && (sig == SIGSEGV)) ||
168 ((user_debug & UDBG_BUS) && (sig == SIGBUS))) { 170 ((user_debug & UDBG_BUS) && (sig == SIGBUS))) {
@@ -557,6 +559,7 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
557 inf->name, fsr, addr); 559 inf->name, fsr, addr);
558 show_pte(current->mm, addr); 560 show_pte(current->mm, addr);
559 561
562 clear_siginfo(&info);
560 info.si_signo = inf->sig; 563 info.si_signo = inf->sig;
561 info.si_errno = 0; 564 info.si_errno = 0;
562 info.si_code = inf->code; 565 info.si_code = inf->code;
@@ -589,6 +592,7 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
589 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n", 592 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
590 inf->name, ifsr, addr); 593 inf->name, ifsr, addr);
591 594
595 clear_siginfo(&info);
592 info.si_signo = inf->sig; 596 info.si_signo = inf->sig;
593 info.si_errno = 0; 597 info.si_errno = 0;
594 info.si_code = inf->code; 598 info.si_code = inf->code;