Module Name: src
Committed By: martin
Date: Fri Dec 14 12:07:54 UTC 2018
Modified Files:
src/sys/compat/linux/common [netbsd-7-0]: linux_misc_notalpha.c
src/sys/kern [netbsd-7-0]: kern_time.c
Log Message:
Additionally pull up following revision(s) (requested by maxv in ticket #1660):
sys/compat/linux/common/linux_misc_notalpha.c: revision 1.110
sys/kern/kern_time.c: revision 1.193
Improve my kern_time.c::rev1.192, systematically clear the buffers we get
from 'ptimer_pool' to prevent more leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.108.34.1 -r1.108.34.1.2.1 \
src/sys/compat/linux/common/linux_misc_notalpha.c
cvs rdiff -u -r1.179.12.2 -r1.179.12.3 src/sys/kern/kern_time.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/linux/common/linux_misc_notalpha.c
diff -u src/sys/compat/linux/common/linux_misc_notalpha.c:1.108.34.1 src/sys/compat/linux/common/linux_misc_notalpha.c:1.108.34.1.2.1
--- src/sys/compat/linux/common/linux_misc_notalpha.c:1.108.34.1 Sat Jan 17 12:10:54 2015
+++ src/sys/compat/linux/common/linux_misc_notalpha.c Fri Dec 14 12:07:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc_notalpha.c,v 1.108.34.1 2015/01/17 12:10:54 martin Exp $ */
+/* $NetBSD: linux_misc_notalpha.c,v 1.108.34.1.2.1 2018/12/14 12:07:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.108.34.1 2015/01/17 12:10:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.108.34.1.2.1 2018/12/14 12:07:54 martin Exp $");
/*
* Note that we must NOT include "opt_compat_linux32.h" here,
@@ -161,6 +161,7 @@ linux_sys_alarm(struct lwp *l, const str
if (spare == NULL) {
mutex_spin_exit(&timer_lock);
spare = pool_get(&ptimer_pool, PR_WAITOK);
+ memset(spare, 0, sizeof(*spare));
goto retry;
}
ptp = spare;
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.179.12.2 src/sys/kern/kern_time.c:1.179.12.3
--- src/sys/kern/kern_time.c:1.179.12.2 Thu Nov 29 09:00:14 2018
+++ src/sys/kern/kern_time.c Fri Dec 14 12:07:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.179.12.2 2018/11/29 09:00:14 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.179.12.3 2018/12/14 12:07:54 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.12.2 2018/11/29 09:00:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.12.3 2018/12/14 12:07:54 martin Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -1126,6 +1126,7 @@ dosetitimer(struct proc *p, int which, s
if (spare == NULL) {
mutex_spin_exit(&timer_lock);
spare = pool_get(&ptimer_pool, PR_WAITOK);
+ memset(spare, 0, sizeof(*spare));
goto retry;
}
pt = spare;
