Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7-1]: src/sys Additionally pull up following revision(s) (request...



details:   https://anonhg.NetBSD.org/src/rev/aef547267411
branches:  netbsd-7-1
changeset: 446679:aef547267411
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Dec 14 12:06:43 2018 +0000

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

diffstat:

 sys/compat/linux/common/linux_misc_notalpha.c |  5 +++--
 sys/kern/kern_time.c                          |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 2d9911287f71 -r aef547267411 sys/compat/linux/common/linux_misc_notalpha.c
--- a/sys/compat/linux/common/linux_misc_notalpha.c     Wed Dec 12 11:37:15 2018 +0000
+++ b/sys/compat/linux/common/linux_misc_notalpha.c     Fri Dec 14 12:06:43 2018 +0000
@@ -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.6.1 2018/12/14 12:06:43 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.6.1 2018/12/14 12:06:43 martin Exp $");
 
 /*
  * Note that we must NOT include "opt_compat_linux32.h" here,
@@ -161,6 +161,7 @@
                if (spare == NULL) {
                        mutex_spin_exit(&timer_lock);
                        spare = pool_get(&ptimer_pool, PR_WAITOK);
+                       memset(spare, 0, sizeof(*spare));
                        goto retry;
                }
                ptp = spare;
diff -r 2d9911287f71 -r aef547267411 sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Wed Dec 12 11:37:15 2018 +0000
+++ b/sys/kern/kern_time.c      Fri Dec 14 12:06:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time.c,v 1.179.8.1.4.1 2018/11/29 08:59:26 martin Exp $   */
+/*     $NetBSD: kern_time.c,v 1.179.8.1.4.2 2018/12/14 12:06:43 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.8.1.4.1 2018/11/29 08:59:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.8.1.4.2 2018/12/14 12:06:43 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
@@ -1126,6 +1126,7 @@
                if (spare == NULL) {
                        mutex_spin_exit(&timer_lock);
                        spare = pool_get(&ptimer_pool, PR_WAITOK);
+                       memset(spare, 0, sizeof(*spare));
                        goto retry;
                }
                pt = spare;



Home | Main Index | Thread Index | Old Index