Module Name: src
Committed By: martin
Date: Fri Nov 30 10:32:22 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: kern_exit.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1114):
sys/kern/kern_exit.c: revision 1.273
Fix info leak. There is one branch where 'status' is not initialized at
all.
+ Possible info leak: [len=4, leaked=4]
| #0 0xffffffff80baf397 in kleak_copyout
| #1 0xffffffff80b56d0c in sys_wait6
| #2 0xffffffff80259c42 in syscall
To generate a diff of this commit:
cvs rdiff -u -r1.268.8.1 -r1.268.8.2 src/sys/kern/kern_exit.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/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.268.8.1 src/sys/kern/kern_exit.c:1.268.8.2
--- src/sys/kern/kern_exit.c:1.268.8.1 Thu Apr 12 13:42:48 2018
+++ src/sys/kern/kern_exit.c Fri Nov 30 10:32:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exit.c,v 1.268.8.1 2018/04/12 13:42:48 martin Exp $ */
+/* $NetBSD: kern_exit.c,v 1.268.8.2 2018/11/30 10:32:22 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.268.8.1 2018/04/12 13:42:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.268.8.2 2018/11/30 10:32:22 martin Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -661,6 +661,7 @@ do_sys_waitid(idtype_t idtype, id_t id,
if (child == NULL) {
mutex_exit(proc_lock);
*pid = 0;
+ *status = 0;
return error;
}
*pid = child->p_pid;
