From: guenther <guenther@openbsd.org>
Date: Wed, 5 Apr 2017 04:15:44 +0000 (+0000)
Subject: timeval has trailing padding on powerpc and m88k, so memset it before
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e526d8a15118b2469b711c61441407c5fd2b3ba0;p=openbsd

timeval has trailing padding on powerpc and m88k, so memset it before
copyout to avoid leaking kernel stack

ok deraadt@
---

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index cb38823cfd0..d08767d14bc 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sysctl.c,v 1.323 2017/04/05 04:00:41 deraadt Exp $	*/
+/*	$OpenBSD: kern_sysctl.c,v 1.324 2017/04/05 04:15:44 guenther Exp $	*/
 /*	$NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $	*/
 
 /*-
@@ -370,6 +370,7 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
 		return (sysctl_clockrate(oldp, oldlenp, newp));
 	case KERN_BOOTTIME: {
 		struct timeval bt;
+		memset(&bt, 0, sizeof bt);
 		TIMESPEC_TO_TIMEVAL(&bt, &boottime);
 		return (sysctl_rdstruct(oldp, oldlenp, newp, &bt, sizeof bt));
 	  }