Module Name: src
Committed By: snj
Date: Sat Aug 19 04:24:20 UTC 2017
Modified Files:
src/sys/kern [netbsd-6-0]: kern_ktrace.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1484):
sys/kern/kern_ktrace.c: revision 1.171 via patch
Clamp the length we use, not the length we don't.
Avoids uninitialized memory disclosure to userland.
>From Ilja Van Sprundel.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.160.6.1 src/sys/kern/kern_ktrace.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_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.160 src/sys/kern/kern_ktrace.c:1.160.6.1
--- src/sys/kern/kern_ktrace.c:1.160 Fri Dec 30 20:33:04 2011
+++ src/sys/kern/kern_ktrace.c Sat Aug 19 04:24:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.160 2011/12/30 20:33:04 christos Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.160.6.1 2017/08/19 04:24:20 snj Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.160 2011/12/30 20:33:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.160.6.1 2017/08/19 04:24:20 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -952,7 +952,7 @@ ktruser(const char *id, void *addr, size
user_dta = (void *)(ktp + 1);
if ((error = copyin(addr, (void *)user_dta, len)) != 0)
- len = 0;
+ kte->kte_kth.ktr_len = 0;
ktraddentry(l, kte, KTA_WAITOK);
return error;
