Module Name: src
Committed By: snj
Date: Sat Mar 3 20:44:39 UTC 2018
Modified Files:
src/sys/dev [netbsd-6]: rndpseudo.c
src/sys/kern [netbsd-6]: subr_cprng.c
src/sys/sys [netbsd-6]: cprng.h
Log Message:
Apply patch (requested by riastradh in ticket #1512):
Fix panic when waiting with kqueue/kevent for a read from
/dev/random.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.5.2.8 -r1.5.2.9 src/sys/kern/subr_cprng.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/sys/cprng.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.6.2.3 src/sys/dev/rndpseudo.c:1.6.2.4
--- src/sys/dev/rndpseudo.c:1.6.2.3 Mon May 21 16:49:54 2012
+++ src/sys/dev/rndpseudo.c Sat Mar 3 20:44:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.6.2.3 2012/05/21 16:49:54 jdc Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.6.2.4 2018/03/03 20:44:38 snj Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.6.2.3 2012/05/21 16:49:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.6.2.4 2018/03/03 20:44:38 snj Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -673,13 +673,13 @@ rnd_poll(struct file *fp, int events)
}
}
+ mutex_enter(&ctx->cprng->mtx);
if (cprng_strong_ready(ctx->cprng)) {
revents |= events & (POLLIN | POLLRDNORM);
} else {
- mutex_enter(&ctx->cprng->mtx);
selrecord(curlwp, &ctx->cprng->selq);
- mutex_exit(&ctx->cprng->mtx);
}
+ mutex_exit(&ctx->cprng->mtx);
return (revents);
}
@@ -731,12 +731,24 @@ static int
filt_rndread(struct knote *kn, long hint)
{
cprng_strong_t *c = kn->kn_hook;
+ int ret;
+ if (hint & NOTE_SUBMIT)
+ KASSERT(mutex_owned(&c->mtx));
+ else
+ mutex_enter(&c->mtx);
if (cprng_strong_ready(c)) {
kn->kn_data = RND_TEMP_BUFFER_SIZE;
- return 1;
+ ret = 1;
+ } else {
+ ret = 0;
}
- return 0;
+ if (hint & NOTE_SUBMIT)
+ KASSERT(mutex_owned(&c->mtx));
+ else
+ mutex_exit(&c->mtx);
+
+ return ret;
}
static const struct filterops rnd_seltrue_filtops =
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.5.2.8 src/sys/kern/subr_cprng.c:1.5.2.9
--- src/sys/kern/subr_cprng.c:1.5.2.8 Fri Mar 29 00:44:28 2013
+++ src/sys/kern/subr_cprng.c Sat Mar 3 20:44:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.5.2.8 2013/03/29 00:44:28 msaitoh Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.5.2.9 2018/03/03 20:44:38 snj Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include <sys/cprng.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.5.2.8 2013/03/29 00:44:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.5.2.9 2018/03/03 20:44:38 snj Exp $");
void
cprng_init(void)
@@ -95,7 +95,7 @@ cprng_strong_doreseed(cprng_strong_t *co
if (c->flags & CPRNG_USE_CV) {
cv_broadcast(&c->cv);
}
- selnotify(&c->selq, 0, 0);
+ selnotify(&c->selq, 0, NOTE_SUBMIT);
}
static void
@@ -397,7 +397,7 @@ cprng_strong_setflags(cprng_strong_t *co
if (c->flags & CPRNG_USE_CV) {
cv_broadcast(&c->cv);
}
- selnotify(&c->selq, 0, 0);
+ selnotify(&c->selq, 0, NOTE_SUBMIT);
}
}
c->flags = flags;
Index: src/sys/sys/cprng.h
diff -u src/sys/sys/cprng.h:1.4.2.1 src/sys/sys/cprng.h:1.4.2.2
--- src/sys/sys/cprng.h:1.4.2.1 Fri Apr 20 23:35:20 2012
+++ src/sys/sys/cprng.h Sat Mar 3 20:44:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cprng.h,v 1.4.2.1 2012/04/20 23:35:20 riz Exp $ */
+/* $NetBSD: cprng.h,v 1.4.2.2 2018/03/03 20:44:39 snj Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -121,12 +121,11 @@ static inline int
cprng_strong_ready(cprng_strong_t *c)
{
int ret = 0;
-
- mutex_enter(&c->mtx);
+
+ KASSERT(mutex_owned(&c->mtx));
if (c->drbg.reseed_counter < NIST_CTR_DRBG_RESEED_INTERVAL) {
ret = 1;
}
- mutex_exit(&c->mtx);
return ret;
}
