Module Name: src
Committed By: riastradh
Date: Mon Mar 21 00:25:04 UTC 2022
Modified Files:
src/sys/kern: kern_entropy.c
Log Message:
entropy(9): Make rnd_lock_sources work while cold.
x86 uses entropy_extract verrrrrry early. Fixes mistake in previous
that did not manifest in my testing on aarch64, which does not use it
so early.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/kern_entropy.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_entropy.c
diff -u src/sys/kern/kern_entropy.c:1.50 src/sys/kern/kern_entropy.c:1.51
--- src/sys/kern/kern_entropy.c:1.50 Sun Mar 20 18:19:58 2022
+++ src/sys/kern/kern_entropy.c Mon Mar 21 00:25:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_entropy.c,v 1.50 2022/03/20 18:19:58 riastradh Exp $ */
+/* $NetBSD: kern_entropy.c,v 1.51 2022/03/21 00:25:04 riastradh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.50 2022/03/20 18:19:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.51 2022/03/21 00:25:04 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1698,9 +1698,10 @@ rnd_lock_sources(int flags)
{
int error;
- KASSERT(mutex_owned(&E->lock));
+ KASSERT(E->stage == ENTROPY_COLD || mutex_owned(&E->lock));
while (E->sourcelock) {
+ KASSERT(E->stage >= ENTROPY_WARM);
if (!ISSET(flags, ENTROPY_WAIT))
return EWOULDBLOCK;
if (ISSET(flags, ENTROPY_SIG)) {
