[src/netbsd-6-0]: src/sys/kern Pull up following revision(s) (requested by mr...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bb2ff3427a8
branches:  netbsd-6-0
changeset: 775248:6bb2ff3427a8
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 19 04:24:20 2017 +0000

description:
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.

diffstat:

 sys/kern/kern_ktrace.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5630b9f2d667 -r 6bb2ff3427a8 sys/kern/kern_ktrace.c
--- a/sys/kern/kern_ktrace.c    Sat Aug 19 04:19:55 2017 +0000
+++ b/sys/kern/kern_ktrace.c    Sat Aug 19 04:24:20 2017 +0000
@@ -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 @@
 
        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;