[src/trunk]: src/sys/kern The callout is used by any nonvirtual timer includi...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/898d008d4439
branches:  trunk
changeset: 449141:898d008d4439
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Feb 24 07:23:11 2019 +0000

description:
The callout is used by any nonvirtual timer including CLOCK_MONOTONIC
and needs to be initialized.

Detected by [syzkaller].

diffstat:

 sys/kern/kern_time.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 68fd7e8cbc9b -r 898d008d4439 sys/kern/kern_time.c
--- a/sys/kern/kern_time.c      Sun Feb 24 07:20:33 2019 +0000
+++ b/sys/kern/kern_time.c      Sun Feb 24 07:23:11 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_time.c,v 1.195 2019/02/10 17:13:33 christos Exp $ */
+/*     $NetBSD: kern_time.c,v 1.196 2019/02/24 07:23:11 mlelstv 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.195 2019/02/10 17:13:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.196 2019/02/24 07:23:11 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
@@ -1177,7 +1177,7 @@
                pt->pt_type = which;
                pt->pt_entry = which;
                pt->pt_queued = false;
-               if (pt->pt_type == CLOCK_REALTIME)
+               if (!CLOCK_VIRTUAL_P(which))
                        callout_init(&pt->pt_ch, CALLOUT_MPSAFE);
                else
                        pt->pt_active = 0;