Module Name: src
Committed By: riastradh
Date: Wed Mar 1 08:13:54 UTC 2023
Modified Files:
src/sys/kern: kern_entropy.c
Log Message:
random(4): Report number of bytes ready to read, not number of bits.
Only affects systems with the diagnostic and testing option
kern.entropy.depletion=1.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 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.57 src/sys/kern/kern_entropy.c:1.58
--- src/sys/kern/kern_entropy.c:1.57 Fri Aug 5 23:43:46 2022
+++ src/sys/kern/kern_entropy.c Wed Mar 1 08:13:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_entropy.c,v 1.57 2022/08/05 23:43:46 riastradh Exp $ */
+/* $NetBSD: kern_entropy.c,v 1.58 2023/03/01 08:13:54 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.57 2022/08/05 23:43:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.58 2023/03/01 08:13:54 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1554,7 +1554,7 @@ filt_entropy_read_event(struct knote *kn
ret = 0;
} else {
if (atomic_load_relaxed(&entropy_depletion))
- kn->kn_data = ENTROPY_CAPACITY*NBBY;
+ kn->kn_data = ENTROPY_CAPACITY; /* bytes */
else
kn->kn_data = MIN(INT64_MAX, SSIZE_MAX);
ret = 1;
