Module Name: src
Committed By: martin
Date: Wed Jan 30 13:32:58 UTC 2019
Modified Files:
src/sys/arch/alpha/alpha [netbsd-7-0]: machdep.c
src/sys/arch/amd64/amd64 [netbsd-7-0]: netbsd32_machdep.c
src/sys/arch/arm/arm [netbsd-7-0]: sig_machdep.c
src/sys/arch/hppa/hppa [netbsd-7-0]: sig_machdep.c
src/sys/arch/i386/i386 [netbsd-7-0]: machdep.c
src/sys/arch/m68k/m68k [netbsd-7-0]: sig_machdep.c
src/sys/arch/mips/mips [netbsd-7-0]: netbsd32_machdep.c sig_machdep.c
src/sys/arch/powerpc/powerpc [netbsd-7-0]: sig_machdep.c
src/sys/arch/sh3/sh3 [netbsd-7-0]: sh3_machdep.c
src/sys/arch/sparc64/sparc64 [netbsd-7-0]: machdep.c netbsd32_machdep.c
src/sys/arch/usermode/target/i386 [netbsd-7-0]: cpu_i386.c
src/sys/arch/usermode/target/x86_64 [netbsd-7-0]: cpu_x86_64.c
src/sys/arch/vax/vax [netbsd-7-0]: sig_machdep.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1677):
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/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.345.4.1 -r1.345.4.2 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.92 -r1.92.8.1 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.47 -r1.47.6.1 src/sys/arch/arm/arm/sig_machdep.c
cvs rdiff -u -r1.25 -r1.25.34.1 src/sys/arch/hppa/hppa/sig_machdep.c
cvs rdiff -u -r1.752.8.2 -r1.752.8.3 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.49 -r1.49.18.1 src/sys/arch/m68k/m68k/sig_machdep.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.23 -r1.23.32.1 src/sys/arch/mips/mips/sig_machdep.c
cvs rdiff -u -r1.43.14.1 -r1.43.14.1.2.1 \
src/sys/arch/powerpc/powerpc/sig_machdep.c
cvs rdiff -u -r1.102.8.1 -r1.102.8.2 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.278.2.3 -r1.278.2.3.2.1 \
src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.103.8.1 -r1.103.8.2 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.4 -r1.4.20.1 src/sys/arch/usermode/target/i386/cpu_i386.c
cvs rdiff -u -r1.2 -r1.2.28.1 \
src/sys/arch/usermode/target/x86_64/cpu_x86_64.c
cvs rdiff -u -r1.21 -r1.21.32.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.345.4.1 src/sys/arch/alpha/alpha/machdep.c:1.345.4.2
--- src/sys/arch/alpha/alpha/machdep.c:1.345.4.1 Tue Nov 1 20:27:51 2016
+++ src/sys/arch/alpha/alpha/machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.345.4.1 2016/11/01 20:27:51 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.345.4.2 2019/01/30 13:32:57 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.345.4.1 2016/11/01 20:27:51 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.345.4.2 2019/01/30 13:32:57 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1465,12 +1465,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.92 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.92.8.1
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.92 Sat Feb 15 22:20:41 2014
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.92 2014/02/15 22:20:41 dsl Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.92.8.1 2019/01/30 13:32:57 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.92 2014/02/15 22:20:41 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.92.8.1 2019/01/30 13:32:57 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -189,6 +189,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:
@@ -316,6 +318,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;
@@ -326,7 +329,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.47 src/sys/arch/arm/arm/sig_machdep.c:1.47.6.1
--- src/sys/arch/arm/arm/sig_machdep.c:1.47 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/sig_machdep.c Wed Jan 30 13:32:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.47 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.47.6.1 2019/01/30 13:32:56 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.47 2013/08/18 06:28:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.47.6.1 2019/01/30 13:32:56 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.34.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 Wed Jan 30 13:32:56 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.34.1 2019/01/30 13:32:56 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.34.1 2019/01/30 13:32:56 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.752.8.2 src/sys/arch/i386/i386/machdep.c:1.752.8.3
--- src/sys/arch/i386/i386/machdep.c:1.752.8.2 Mon Jan 22 19:40:25 2018
+++ src/sys/arch/i386/i386/machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.752.8.2 2018/01/22 19:40:25 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.752.8.3 2019/01/30 13:32:57 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.752.8.2 2018/01/22 19:40:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.752.8.3 2019/01/30 13:32:57 martin Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -653,6 +653,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;
@@ -663,7 +664,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.18.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 Wed Jan 30 13:32:57 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.18.1 2019/01/30 13:32:57 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.18.1 2019/01/30 13:32:57 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.11 src/sys/arch/mips/mips/netbsd32_machdep.c:1.11.8.1
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.11 Sat Jan 25 15:20:55 2014
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.11 2014/01/25 15:20:55 christos Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.11.8.1 2019/01/30 13:32:57 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.11 2014/01/25 15:20:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.11.8.1 2019/01/30 13:32:57 martin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -176,6 +176,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. */
@@ -195,7 +196,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.32.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 Wed Jan 30 13:32:57 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.32.1 2019/01/30 13:32:57 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.32.1 2019/01/30 13:32:57 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.43.14.1 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.43.14.1.2.1
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.43.14.1 Wed Dec 31 06:51:08 2014
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.43.14.1 2014/12/31 06:51:08 snj Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.43.14.1.2.1 2019/01/30 13:32:57 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.43.14.1 2014/12/31 06:51:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.43.14.1.2.1 2019/01/30 13:32:57 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/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.102.8.1 src/sys/arch/sh3/sh3/sh3_machdep.c:1.102.8.2
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.102.8.1 Sat Dec 26 22:15:34 2015
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.102.8.1 2015/12/26 22:15:34 snj Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.102.8.2 2019/01/30 13:32:57 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.102.8.1 2015/12/26 22:15:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102.8.2 2019/01/30 13:32:57 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -363,13 +363,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.278.2.3 src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.3.2.1
--- src/sys/arch/sparc64/sparc64/machdep.c:1.278.2.3 Sat Mar 21 17:32:13 2015
+++ src/sys/arch/sparc64/sparc64/machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.278.2.3 2015/03/21 17:32:13 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.278.2.3.2.1 2019/01/30 13:32:57 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.278.2.3 2015/03/21 17:32:13 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.278.2.3.2.1 2019/01/30 13:32:57 martin Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -450,12 +450,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.103.8.1 src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.103.8.2
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep.c:1.103.8.1 Mon Nov 16 13:39:47 2015
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep.c Wed Jan 30 13:32:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.103.8.1 2015/11/16 13:39:47 msaitoh Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.103.8.2 2019/01/30 13:32:57 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.103.8.1 2015/11/16 13:39:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.103.8.2 2019/01/30 13:32:57 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -214,6 +214,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.20.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 Wed Jan 30 13:32:57 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.20.1 2019/01/30 13:32:57 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.20.1 2019/01/30 13:32:57 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.28.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 Wed Jan 30 13:32:58 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.28.1 2019/01/30 13:32:58 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.28.1 2019/01/30 13:32:58 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.21 src/sys/arch/vax/vax/sig_machdep.c:1.21.32.1
--- src/sys/arch/vax/vax/sig_machdep.c:1.21 Sun Jul 3 02:18:21 2011
+++ src/sys/arch/vax/vax/sig_machdep.c Wed Jan 30 13:32:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.21 2011/07/03 02:18:21 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.21.32.1 2019/01/30 13:32:58 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.21 2011/07/03 02:18:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.21.32.1 2019/01/30 13:32:58 martin Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -164,6 +164,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;
@@ -171,10 +172,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);
