Module Name: src
Committed By: christos
Date: Mon Oct 29 22:02:25 UTC 2018
Modified Files:
src/sys/kern: kern_ntptime.c
Log Message:
Zero out the ntptimeval structure to prevent a 4 byte kernel stack disclosure.
Reported by Thomas Barabosch.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/kern/kern_ntptime.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_ntptime.c
diff -u src/sys/kern/kern_ntptime.c:1.59 src/sys/kern/kern_ntptime.c:1.60
--- src/sys/kern/kern_ntptime.c:1.59 Sun Jul 1 11:12:06 2018
+++ src/sys/kern/kern_ntptime.c Mon Oct 29 18:02:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ntptime.c,v 1.59 2018/07/01 15:12:06 riastradh Exp $ */
+/* $NetBSD: kern_ntptime.c,v 1.60 2018/10/29 22:02:25 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.59 2018/07/01 15:12:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.60 2018/10/29 22:02:25 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -239,6 +239,7 @@ static void hardupdate(long offset);
void
ntp_gettime(struct ntptimeval *ntv)
{
+ memset(ntv, 0, sizeof(*ntv));
mutex_spin_enter(&timecounter_lock);
nanotime(&ntv->time);
