Module Name: src
Committed By: martin
Date: Sun Jan 27 18:43:09 UTC 2019
Modified Files:
src/sys/arch/alpha/alpha [netbsd-8]: machdep.c
src/sys/arch/amd64/amd64 [netbsd-8]: netbsd32_machdep.c
src/sys/arch/arm/arm [netbsd-8]: sig_machdep.c
src/sys/arch/hppa/hppa [netbsd-8]: sig_machdep.c
src/sys/arch/i386/i386 [netbsd-8]: machdep.c
src/sys/arch/m68k/m68k [netbsd-8]: sig_machdep.c
src/sys/arch/mips/mips [netbsd-8]: netbsd32_machdep.c sig_machdep.c
src/sys/arch/powerpc/powerpc [netbsd-8]: sig_machdep.c
src/sys/arch/riscv/riscv [netbsd-8]: sig_machdep.c
src/sys/arch/sh3/sh3 [netbsd-8]: sh3_machdep.c
src/sys/arch/sparc64/sparc64 [netbsd-8]: machdep.c netbsd32_machdep.c
src/sys/arch/usermode/target/i386 [netbsd-8]: cpu_i386.c
src/sys/arch/usermode/target/x86_64 [netbsd-8]: cpu_x86_64.c
src/sys/arch/vax/vax [netbsd-8]: sig_machdep.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1173):
sys/arch/hppa/hppa/sig_machdep.c: revision 1.26
sys/arch/arm/arm/sig_machdep.c: revision 1.51
sys/arch/i386/i386/machdep.c: revision 1.813
sys/arch/alpha/alpha/machdep.c: revision 1.352
sys/arch/m68k/m68k/sig_machdep.c: revision 1.50
sys/arch/usermode/target/i386/cpu_i386.c: revision 1.8
sys/arch/sparc64/sparc64/machdep.c: revision 1.289
sys/arch/sparc64/sparc64/netbsd32_machdep.c: revision 1.111
sys/arch/powerpc/powerpc/sig_machdep.c: revision 1.46
sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.117
sys/arch/sh3/sh3/sh3_machdep.c: revision 1.106
sys/arch/mips/mips/netbsd32_machdep.c: revision 1.16
sys/arch/mips/mips/sig_machdep.c: revision 1.24
sys/arch/riscv/riscv/sig_machdep.c: revision 1.2
sys/arch/usermode/target/x86_64/cpu_x86_64.c: revision 1.7
sys/arch/vax/vax/sig_machdep.c: revision 1.23
Fix widespread leak in the sendsig_siginfo() functions. sigframe_siginfo
has padding, so zero it out properly. While here I'm also zeroing out some
other things in several ports, for safety. Same problem in netbsd32, so
fix that too.
I can't compile-test on each architecture, but there should be no
breakage (tm).
Overall this fixes at least 14 info leaks. Prompted by the discovery by
KLEAK of a leak in amd64's sendsig_siginfo.
To generate a diff of this commit:
cvs rdiff -u -r1.350 -r1.350.6.1 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.105.2.1 -r1.105.2.2 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.49 -r1.49.10.1 src/sys/arch/arm/arm/sig_machdep.c
cvs rdiff -u -r1.25 -r1.25.48.1 src/sys/arch/hppa/hppa/sig_machdep.c
cvs rdiff -u -r1.782.6.6 -r1.782.6.7 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.49 -r1.49.32.1 src/sys/arch/m68k/m68k/sig_machdep.c
cvs rdiff -u -r1.14 -r1.14.6.1 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.23 -r1.23.46.1 src/sys/arch/mips/mips/sig_machdep.c
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/powerpc/powerpc/sig_machdep.c
cvs rdiff -u -r1.1 -r1.1.12.1 src/sys/arch/riscv/riscv/sig_machdep.c
cvs rdiff -u -r1.105 -r1.105.8.1 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.287 -r1.287.8.1 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.110 -r1.110.8.1 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/arch/usermode/target/i386/cpu_i386.c
cvs rdiff -u -r1.2 -r1.2.42.1 \
src/sys/arch/usermode/target/x86_64/cpu_x86_64.c
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/arch/vax/vax/sig_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.350 src/sys/arch/alpha/alpha/machdep.c:1.350.6.1
--- src/sys/arch/alpha/alpha/machdep.c:1.350 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/alpha/alpha/machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.350 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.350.6.1 2019/01/27 18:43:08 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.350 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.350.6.1 2019/01/27 18:43:08 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1467,12 +1467,11 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
#endif
/* Build stack frame for signal trampoline. */
-
+ memset(&frame, 0, sizeof(frame));
frame.sf_si._info = ksi->ksi_info;
frame.sf_uc.uc_flags = _UC_SIGMASK;
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_link = l->l_ctxlink;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &frame.sf_uc.uc_mcontext, &frame.sf_uc.uc_flags);
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.105.2.1 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.105.2.2
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.105.2.1 Thu Dec 21 19:53:28 2017
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.105.2.1 2017/12/21 19:53:28 snj Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.105.2.2 2019/01/27 18:43:08 martin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.105.2.1 2017/12/21 19:53:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.105.2.2 2019/01/27 18:43:08 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -229,6 +229,8 @@ netbsd32_sendsig_sigcontext(const ksigin
fp = (struct netbsd32_sigframe_sigcontext *)tf->tf_rsp;
fp--;
+ memset(&frame, 0, sizeof(frame));
+
/* Build stack frame for signal trampoline. */
switch (ps->sa_sigdesc[sig].sd_vers) {
case 0:
@@ -328,6 +330,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
break;
}
+ memset(&frame, 0, sizeof(frame));
frame.sf_ra = (uint32_t)(uintptr_t)ps->sa_sigdesc[sig].sd_tramp;
frame.sf_signum = sig;
frame.sf_sip = (uint32_t)(uintptr_t)&fp->sf_si;
@@ -338,7 +341,6 @@ netbsd32_sendsig_siginfo(const ksiginfo_
frame.sf_uc.uc_link = (uint32_t)(uintptr_t)l->l_ctxlink;
frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
Index: src/sys/arch/arm/arm/sig_machdep.c
diff -u src/sys/arch/arm/arm/sig_machdep.c:1.49 src/sys/arch/arm/arm/sig_machdep.c:1.49.10.1
--- src/sys/arch/arm/arm/sig_machdep.c:1.49 Tue Mar 24 08:38:29 2015
+++ src/sys/arch/arm/arm/sig_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.49 2015/03/24 08:38:29 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.49.10.1 2019/01/27 18:43:08 martin Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.49 2015/03/24 08:38:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.49.10.1 2019/01/27 18:43:08 martin Exp $");
#include <sys/mount.h> /* XXX only needed by syscallargs.h */
#include <sys/cpu.h>
@@ -107,13 +107,13 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp = (struct sigframe_siginfo *)STACK_ALIGN(fp, STACK_ALIGNBYTES);
/* populate the siginfo frame */
+ memset(&frame, 0, sizeof(frame));
frame.sf_si._info = ksi->ksi_info;
frame.sf_uc.uc_flags = _UC_SIGMASK;
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_link = l->l_ctxlink;
frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
Index: src/sys/arch/hppa/hppa/sig_machdep.c
diff -u src/sys/arch/hppa/hppa/sig_machdep.c:1.25 src/sys/arch/hppa/hppa/sig_machdep.c:1.25.48.1
--- src/sys/arch/hppa/hppa/sig_machdep.c:1.25 Tue Feb 8 20:20:15 2011
+++ src/sys/arch/hppa/hppa/sig_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.25 2011/02/08 20:20:15 rmind Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.25.48.1 2019/01/27 18:43:08 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.25 2011/02/08 20:20:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.25.48.1 2019/01/27 18:43:08 martin Exp $");
#include "opt_compat_netbsd.h"
@@ -141,13 +141,13 @@ sendsig_siginfo(const struct ksiginfo *k
break;
}
+ memset(&frame, 0, sizeof(frame));
frame.sf_si._info = ksi->ksi_info;
frame.sf_uc.uc_flags = _UC_SIGMASK |
((l->l_sigstk.ss_flags & SS_ONSTACK) ?
_UC_SETSTACK : _UC_CLRSTACK);
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_link = l->l_ctxlink;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &frame.sf_uc.uc_mcontext, &frame.sf_uc.uc_flags);
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.782.6.6 src/sys/arch/i386/i386/machdep.c:1.782.6.7
--- src/sys/arch/i386/i386/machdep.c:1.782.6.6 Sat Jun 9 15:12:21 2018
+++ src/sys/arch/i386/i386/machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.782.6.6 2018/06/09 15:12:21 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.782.6.7 2019/01/27 18:43:08 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.782.6.6 2018/06/09 15:12:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.782.6.7 2019/01/27 18:43:08 martin Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -739,6 +739,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp--;
+ memset(&frame, 0, sizeof(frame));
frame.sf_ra = (int)ps->sa_sigdesc[sig].sd_tramp;
frame.sf_signum = sig;
frame.sf_sip = &fp->sf_si;
@@ -749,7 +750,6 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
frame.sf_uc.uc_link = l->l_ctxlink;
frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
if (tf->tf_eflags & PSL_VM)
(*p->p_emul->e_syscall_intern)(p);
Index: src/sys/arch/m68k/m68k/sig_machdep.c
diff -u src/sys/arch/m68k/m68k/sig_machdep.c:1.49 src/sys/arch/m68k/m68k/sig_machdep.c:1.49.32.1
--- src/sys/arch/m68k/m68k/sig_machdep.c:1.49 Mon May 21 14:15:18 2012
+++ src/sys/arch/m68k/m68k/sig_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.49 2012/05/21 14:15:18 martin Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.49.32.1 2019/01/27 18:43:08 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,7 +40,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.49 2012/05/21 14:15:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.49.32.1 2019/01/27 18:43:08 martin Exp $");
#define __M68K_SIGNAL_PRIVATE
@@ -159,6 +159,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp--;
+ memset(&kf, 0, sizeof(kf));
kf.sf_ra = (int)ps->sa_sigdesc[sig].sd_tramp;
kf.sf_signum = sig;
kf.sf_sip = &fp->sf_si;
@@ -169,7 +170,6 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
kf.sf_uc.uc_link = l->l_ctxlink;
kf.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&kf.sf_uc.uc_stack, 0, sizeof(kf.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &kf.sf_uc.uc_mcontext, &kf.sf_uc.uc_flags);
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.14 src/sys/arch/mips/mips/netbsd32_machdep.c:1.14.6.1
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.14 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Sun Jan 27 18:43:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.14 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.14.6.1 2019/01/27 18:43:09 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.14 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.14.6.1 2019/01/27 18:43:09 martin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -177,6 +177,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
sfp--;
+ memset(&sf, 0, sizeof(sf));
netbsd32_si_to_si32(&sf.sf_si, (const siginfo_t *)&ksi->ksi_info);
/* Build stack frame for signal trampoline. */
@@ -196,7 +197,6 @@ netbsd32_sendsig_siginfo(const ksiginfo_
? _UC_SETSTACK : _UC_CLRSTACK);
sf.sf_uc.uc_sigmask = *mask;
sf.sf_uc.uc_link = (intptr_t)l->l_ctxlink;
- memset(&sf.sf_uc.uc_stack, 0, sizeof(sf.sf_uc.uc_stack));
sfsz = offsetof(struct sigframe_siginfo32, sf_uc.uc_mcontext);
if (p->p_md.md_abi == _MIPS_BSD_API_O32)
sfsz += sizeof(mcontext_o32_t);
Index: src/sys/arch/mips/mips/sig_machdep.c
diff -u src/sys/arch/mips/mips/sig_machdep.c:1.23 src/sys/arch/mips/mips/sig_machdep.c:1.23.46.1
--- src/sys/arch/mips/mips/sig_machdep.c:1.23 Sun Jul 10 23:21:59 2011
+++ src/sys/arch/mips/mips/sig_machdep.c Sun Jan 27 18:43:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.23 2011/07/10 23:21:59 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.23.46.1 2019/01/27 18:43:09 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23 2011/07/10 23:21:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23.46.1 2019/01/27 18:43:09 martin Exp $");
#include "opt_cputype.h"
@@ -85,12 +85,12 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
sf--;
+ memset(&ksf, 0, sizeof(ksf));
ksf.sf_si._info = ksi->ksi_info;
ksf.sf_uc.uc_flags = _UC_SIGMASK
| (l->l_sigstk.ss_flags & SS_ONSTACK ? _UC_SETSTACK : _UC_CLRSTACK);
ksf.sf_uc.uc_sigmask = *mask;
ksf.sf_uc.uc_link = l->l_ctxlink;
- memset(&ksf.sf_uc.uc_stack, 0, sizeof(ksf.sf_uc.uc_stack));
sendsig_reset(l, signo);
mutex_exit(p->p_lock);
Index: src/sys/arch/powerpc/powerpc/sig_machdep.c
diff -u src/sys/arch/powerpc/powerpc/sig_machdep.c:1.45 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.45.6.1
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.45 Sun Mar 5 16:09:26 2017
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.45 2017/03/05 16:09:26 chs Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.45.6.1 2019/01/27 18:43:08 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.45 2017/03/05 16:09:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.45.6.1 2019/01/27 18:43:08 martin Exp $");
#include "opt_ppcarch.h"
#include "opt_altivec.h"
@@ -89,10 +89,10 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
sp &= ~(CALLFRAMELEN-1);
/* Save register context. */
+ memset(&uc, 0, sizeof(uc));
uc.uc_flags = _UC_SIGMASK;
uc.uc_sigmask = *mask;
uc.uc_link = l->l_ctxlink;
- memset(&uc.uc_stack, 0, sizeof(uc.uc_stack));
sendsig_reset(l, ksi->ksi_signo);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &uc.uc_mcontext, &uc.uc_flags);
Index: src/sys/arch/riscv/riscv/sig_machdep.c
diff -u src/sys/arch/riscv/riscv/sig_machdep.c:1.1 src/sys/arch/riscv/riscv/sig_machdep.c:1.1.12.1
--- src/sys/arch/riscv/riscv/sig_machdep.c:1.1 Sat Mar 28 16:13:56 2015
+++ src/sys/arch/riscv/riscv/sig_machdep.c Sun Jan 27 18:43:09 2019
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef COMPATNAME1
-__RCSID("$NetBSD: sig_machdep.c,v 1.1 2015/03/28 16:13:56 matt Exp $");
+__RCSID("$NetBSD: sig_machdep.c,v 1.1.12.1 2019/01/27 18:43:09 martin Exp $");
#endif
#include <sys/param.h>
@@ -93,6 +93,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
sf--; // allocate sigframe
+ memset(&ksf, 0, sizeof(ksf));
COPY_SIGINFO(&ksf, ksi);
ksf.sf_uc.uc_flags = _UC_SIGMASK
| (l->l_sigstk.ss_flags & SS_ONSTACK ? _UC_SETSTACK : _UC_CLRSTACK);
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.105 src/sys/arch/sh3/sh3/sh3_machdep.c:1.105.8.1
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.105 Thu Dec 22 14:47:59 2016
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Sun Jan 27 18:43:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.105 2016/12/22 14:47:59 cherry Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.105.8.1 2019/01/27 18:43:09 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.105 2016/12/22 14:47:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.105.8.1 2019/01/27 18:43:09 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -361,13 +361,13 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp = getframe(l, sig, &onstack);
--fp;
+ memset(&frame, 0, sizeof(frame));
frame.sf_si._info = ksi->ksi_info;
frame.sf_uc.uc_link = l->l_ctxlink;
frame.sf_uc.uc_sigmask = *mask;
frame.sf_uc.uc_flags = _UC_SIGMASK;
frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK;
- memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &frame.sf_uc.uc_mcontext, &frame.sf_uc.uc_flags);
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.287 src/sys/arch/sparc64/sparc64/machdep.c:1.287.8.1
--- src/sys/arch/sparc64/sparc64/machdep.c:1.287 Fri Nov 4 18:09:14 2016
+++ src/sys/arch/sparc64/sparc64/machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.287 2016/11/04 18:09:14 macallan Exp $ */
+/* $NetBSD: machdep.c,v 1.287.8.1 2019/01/27 18:43:08 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.287 2016/11/04 18:09:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.287.8.1 2019/01/27 18:43:08 martin Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -451,12 +451,12 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
/* Allocate an aligned sigframe */
fp = (void *)((u_long)(fp - 1) & ~0x0f);
+ memset(&uc, 0, sizeof(uc));
uc.uc_flags = _UC_SIGMASK |
((l->l_sigstk.ss_flags & SS_ONSTACK)
? _UC_SETSTACK : _UC_CLRSTACK);
uc.uc_sigmask = *mask;
uc.uc_link = l->l_ctxlink;
- memset(&uc.uc_stack, 0, sizeof(uc.uc_stack));
sendsig_reset(l, sig);
mutex_exit(p->p_lock);
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110.8.1
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.110 Wed Oct 19 09:44:01 2016
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.110 2016/10/19 09:44:01 skrll Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.110.8.1 2019/01/27 18:43:08 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110 2016/10/19 09:44:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.110.8.1 2019/01/27 18:43:08 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -212,6 +212,7 @@ netbsd32_sendsig_sigcontext(const ksigin
* and then copy it out. We probably ought to just build it
* directly in user space....
*/
+ memset(&sf, 0, sizeof(sf));
sf.sf_signo = sig;
sf.sf_code = (u_int)ksi->ksi_trap;
#if defined(COMPAT_SUNOS) || defined(MODULAR)
Index: src/sys/arch/usermode/target/i386/cpu_i386.c
diff -u src/sys/arch/usermode/target/i386/cpu_i386.c:1.4 src/sys/arch/usermode/target/i386/cpu_i386.c:1.4.34.1
--- src/sys/arch/usermode/target/i386/cpu_i386.c:1.4 Sat Mar 3 21:15:16 2012
+++ src/sys/arch/usermode/target/i386/cpu_i386.c Sun Jan 27 18:43:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_i386.c,v 1.4 2012/03/03 21:15:16 reinoud Exp $ */
+/* $NetBSD: cpu_i386.c,v 1.4.34.1 2019/01/27 18:43:08 martin Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.4 2012/03/03 21:15:16 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.4.34.1 2019/01/27 18:43:08 martin Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -140,6 +140,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp--;
/* set up stack frame */
+ memset(&frame, 0, sizeof(frame));
frame.sf_ra = (int)ps->sa_sigdesc[sig].sd_tramp;
frame.sf_signum = sig;
frame.sf_sip = &fp->sf_si;
Index: src/sys/arch/usermode/target/x86_64/cpu_x86_64.c
diff -u src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.2 src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.2.42.1
--- src/sys/arch/usermode/target/x86_64/cpu_x86_64.c:1.2 Sat Jan 14 17:42:52 2012
+++ src/sys/arch/usermode/target/x86_64/cpu_x86_64.c Sun Jan 27 18:43:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_x86_64.c,v 1.2 2012/01/14 17:42:52 reinoud Exp $ */
+/* $NetBSD: cpu_x86_64.c,v 1.2.42.1 2019/01/27 18:43:09 martin Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_x86_64.c,v 1.2 2012/01/14 17:42:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_x86_64.c,v 1.2.42.1 2019/01/27 18:43:09 martin Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -145,6 +145,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
fp = (struct sigframe_siginfo *) (((unsigned long)sp & ~15) - 8);
/* set up stack frame */
+ memset(&frame, 0, sizeof(frame));
frame.sf_ra = (uint64_t) ps->sa_sigdesc[sig].sd_tramp;
frame.sf_si._info = ksi->ksi_info;
Index: src/sys/arch/vax/vax/sig_machdep.c
diff -u src/sys/arch/vax/vax/sig_machdep.c:1.22 src/sys/arch/vax/vax/sig_machdep.c:1.22.2.1
--- src/sys/arch/vax/vax/sig_machdep.c:1.22 Mon May 22 16:53:05 2017
+++ src/sys/arch/vax/vax/sig_machdep.c Sun Jan 27 18:43:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.22 2017/05/22 16:53:05 ragge Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.22.2.1 2019/01/27 18:43:09 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.22 2017/05/22 16:53:05 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.22.2.1 2019/01/27 18:43:09 martin Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -160,6 +160,7 @@ setupstack_siginfo3(const struct ksiginf
/*
* Arguments given to the signal handler.
*/
+ memset(&tramp, 0, sizeof(tramp));
tramp.narg = 3;
tramp.sig = ksi->ksi_signo;
sp -= sizeof(uc); tramp.ucp = sp;
@@ -167,10 +168,10 @@ setupstack_siginfo3(const struct ksiginf
sp -= sizeof(tramp);
/* Save register context. */
+ memset(&uc, 0, sizeof(uc));
uc.uc_flags = _UC_SIGMASK;
uc.uc_sigmask = *mask;
uc.uc_link = l->l_ctxlink;
- memset(&uc.uc_stack, 0, sizeof(uc.uc_stack));
sendsig_reset(l, ksi->ksi_signo);
mutex_exit(p->p_lock);
cpu_getmcontext(l, &uc.uc_mcontext, &uc.uc_flags);
