Module Name: src
Committed By: martin
Date: Thu Nov 29 14:58:25 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: sys_ptrace_common.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1112):
sys/kern/sys_ptrace_common.c: revision 1.46
Fix stack info leak.
+ Possible info leak: [len=136, leaked=92]
| #0 0xffffffff80baf397 in kleak_copyout
| #1 0xffffffff80bd4155 in ptrace_copyout_siginfo
| #2 0xffffffff80bd5348 in do_ptrace
| #3 0xffffffff80bd40fe in sys_ptrace
| #4 0xffffffff80259c42 in syscall
To generate a diff of this commit:
cvs rdiff -u -r1.22.2.3 -r1.22.2.4 src/sys/kern/sys_ptrace_common.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/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.22.2.3 src/sys/kern/sys_ptrace_common.c:1.22.2.4
--- src/sys/kern/sys_ptrace_common.c:1.22.2.3 Sat May 5 19:13:21 2018
+++ src/sys/kern/sys_ptrace_common.c Thu Nov 29 14:58:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.22.2.3 2018/05/05 19:13:21 martin Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.22.2.4 2018/11/29 14:58:25 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.3 2018/05/05 19:13:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.4 2018/11/29 14:58:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -553,6 +553,7 @@ ptrace_get_siginfo(struct proc *t, struc
{
struct ptrace_siginfo psi;
+ memset(&psi, 0, sizeof(psi));
psi.psi_siginfo._info = t->p_sigctx.ps_info;
psi.psi_lwpid = t->p_sigctx.ps_lwp;