Module Name: src
Committed By: bouyer
Date: Wed Feb 16 21:22:45 UTC 2011
Modified Files:
src/sys/compat/irix [netbsd-5]: irix_signal.c
src/sys/compat/netbsd32 [netbsd-5]: netbsd32_signal.c
src/sys/compat/svr4 [netbsd-5]: svr4_signal.c
src/sys/kern [netbsd-5]: sys_sig.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1556):
sys/compat/irix/irix_signal.c: revision 1.56
sys/compat/svr4/svr4_signal.c: revision 1.65
sys/compat/netbsd32/netbsd32_signal.c: revision 1.35
sys/kern/sys_sig.c: revision 1.31
Explicitly initialize ucontext before calling getmcontext.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.10.1 src/sys/compat/irix/irix_signal.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/compat/netbsd32/netbsd32_signal.c
cvs rdiff -u -r1.64 -r1.64.10.1 src/sys/compat/svr4/svr4_signal.c
cvs rdiff -u -r1.17.4.3 -r1.17.4.4 src/sys/kern/sys_sig.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/compat/irix/irix_signal.c
diff -u src/sys/compat/irix/irix_signal.c:1.48 src/sys/compat/irix/irix_signal.c:1.48.10.1
--- src/sys/compat/irix/irix_signal.c:1.48 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/irix/irix_signal.c Wed Feb 16 21:22:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_signal.c,v 1.48 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: irix_signal.c,v 1.48.10.1 2011/02/16 21:22:44 bouyer Exp $ */
/*-
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.48 2008/04/28 20:23:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.48.10.1 2011/02/16 21:22:44 bouyer Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -710,6 +710,8 @@
f = (struct frame *)l->l_md.md_regs;
+ memset(&kucp, 0, sizeof(kucp));
+
kucp.iuc_flags = IRIX_UC_ALL;
kucp.iuc_link = NULL; /* XXX */
Index: src/sys/compat/netbsd32/netbsd32_signal.c
diff -u src/sys/compat/netbsd32/netbsd32_signal.c:1.31 src/sys/compat/netbsd32/netbsd32_signal.c:1.31.4.1
--- src/sys/compat/netbsd32/netbsd32_signal.c:1.31 Wed Oct 15 06:51:19 2008
+++ src/sys/compat/netbsd32/netbsd32_signal.c Wed Feb 16 21:22:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_signal.c,v 1.31 2008/10/15 06:51:19 wrstuden Exp $ */
+/* $NetBSD: netbsd32_signal.c,v 1.31.4.1 2011/02/16 21:22:45 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.31 2008/10/15 06:51:19 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.31.4.1 2011/02/16 21:22:45 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -362,6 +362,8 @@
struct proc *p = l->l_proc;
ucontext32_t uc;
+ memset(&uc, 0, sizeof(uc));
+
mutex_enter(p->p_lock);
getucontext32(l, &uc);
mutex_exit(p->p_lock);
Index: src/sys/compat/svr4/svr4_signal.c
diff -u src/sys/compat/svr4/svr4_signal.c:1.64 src/sys/compat/svr4/svr4_signal.c:1.64.10.1
--- src/sys/compat/svr4/svr4_signal.c:1.64 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_signal.c Wed Feb 16 21:22:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_signal.c,v 1.64 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_signal.c,v 1.64.10.1 2011/02/16 21:22:44 bouyer Exp $ */
/*-
* Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.64 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.64.10.1 2011/02/16 21:22:44 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -462,6 +462,8 @@
svr4_ucontext_t uc;
*retval = 0;
+ memset(&uc, 0, sizeof(uc));
+
switch (SCARG(uap, func)) {
case SVR4_GETCONTEXT:
DPRINTF(("getcontext(%p)\n", SCARG(uap, uc)));
Index: src/sys/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.17.4.3 src/sys/kern/sys_sig.c:1.17.4.4
--- src/sys/kern/sys_sig.c:1.17.4.3 Thu Jan 7 07:04:50 2010
+++ src/sys/kern/sys_sig.c Wed Feb 16 21:22:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.17.4.3 2010/01/07 07:04:50 snj Exp $ */
+/* $NetBSD: sys_sig.c,v 1.17.4.4 2011/02/16 21:22:45 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.17.4.3 2010/01/07 07:04:50 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.17.4.4 2011/02/16 21:22:45 bouyer Exp $");
#include "opt_ptrace.h"
#include "opt_compat_netbsd.h"
@@ -307,6 +307,8 @@
struct proc *p = l->l_proc;
ucontext_t uc;
+ memset(&uc, 0, sizeof(uc));
+
mutex_enter(p->p_lock);
getucontext(l, &uc);
mutex_exit(p->p_lock);