Module Name: src
Committed By: ad
Date: Tue Dec 17 18:08:15 UTC 2019
Modified Files:
src/sys/kern: kern_sleepq.c
Log Message:
Fix LOCKDEBUG panic on mutex_init().
Reported-by: syzbot+5a77339dc0a55e8d8...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/kern_sleepq.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_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.55 src/sys/kern/kern_sleepq.c:1.56
--- src/sys/kern/kern_sleepq.c:1.55 Mon Dec 16 19:43:36 2019
+++ src/sys/kern/kern_sleepq.c Tue Dec 17 18:08:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.55 2019/12/16 19:43:36 ad Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.56 2019/12/17 18:08:15 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.55 2019/12/16 19:43:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.56 2019/12/17 18:08:15 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -76,12 +76,17 @@ sleepqlock_t sleepq_locks[SLEEPTAB_HASH_
void
sleeptab_init(sleeptab_t *st)
{
+ static bool again;
int i;
for (i = 0; i < SLEEPTAB_HASH_SIZE; i++) {
- mutex_init(&sleepq_locks[i].lock, MUTEX_DEFAULT, IPL_SCHED);
+ if (!again) {
+ mutex_init(&sleepq_locks[i].lock, MUTEX_DEFAULT,
+ IPL_SCHED);
+ }
sleepq_init(&st->st_queue[i]);
}
+ again = true;
}
/*
