[src/trunk]: src/sys/kern entropy(9): On flags change, cancel any scheduled c...

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

details:   https://anonhg.NetBSD.org/src/rev/21c6d86b504b
branches:  trunk
changeset: 375986:21c6d86b504b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed May 24 20:22:12 2023 +0000

description:
entropy(9): On flags change, cancel any scheduled consolidation.

We've been instructed to lose confidence in existing entropy sources,
so let's make sure to re-gather enough entropy before the next
consolidation can happen, in case some of what would be counted in
consolidation is from those entropy sources.

XXX pullup-10

diffstat:

 sys/kern/kern_entropy.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r e14271fee571 -r 21c6d86b504b sys/kern/kern_entropy.c
--- a/sys/kern/kern_entropy.c   Wed May 24 20:02:34 2023 +0000
+++ b/sys/kern/kern_entropy.c   Wed May 24 20:22:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_entropy.c,v 1.59 2023/03/03 12:52:49 riastradh Exp $      */
+/*     $NetBSD: kern_entropy.c,v 1.60 2023/05/24 20:22:12 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.59 2023/03/03 12:52:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.60 2023/05/24 20:22:12 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -2414,6 +2414,7 @@ entropy_ioctl(unsigned long cmd, void *d
                        E->pending = 0;
                        atomic_store_relaxed(&E->needed,
                            ENTROPY_CAPACITY*NBBY);
+                       E->consolidate = false;
                        mutex_exit(&E->lock);
                }