Module Name: src
Committed By: riastradh
Date: Tue Oct 30 14:35:16 UTC 2018
Modified Files:
src/sys/compat/common: kern_time_50.c
Log Message:
Zero ntptimeval50 too to prevent 4-byte kernel stack disclosure.
>From Thomas Barabosch of Fraunhofer FKIE.
XXX pullup-7, pullup-8 (along with rev. 1.60 of kern_ntptime.c)
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/common/kern_time_50.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/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.31 src/sys/compat/common/kern_time_50.c:1.32
--- src/sys/compat/common/kern_time_50.c:1.31 Fri Mar 11 18:32:29 2016
+++ src/sys/compat/common/kern_time_50.c Tue Oct 30 14:35:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.31 2016/03/11 18:32:29 christos Exp $ */
+/* $NetBSD: kern_time_50.c,v 1.32 2018/10/30 14:35:16 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.31 2016/03/11 18:32:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.32 2018/10/30 14:35:16 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -526,6 +526,7 @@ compat_50_sys___ntp_gettime30(struct lwp
if (SCARG(uap, ntvp)) {
ntp_gettime(&ntv);
+ memset(&ntv50, 0, sizeof(ntv50));
timespec_to_timespec50(&ntv.time, &ntv50.time);
ntv50.maxerror = ntv.maxerror;
ntv50.esterror = ntv.esterror;
