Module Name: src
Committed By: riastradh
Date: Sun Feb 28 20:20:17 UTC 2016
Modified Files:
src/sys/kern: kern_rndq.c
Log Message:
Skip disabled sources in rnd_getmore.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/kern/kern_rndq.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_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.83 src/sys/kern/kern_rndq.c:1.84
--- src/sys/kern/kern_rndq.c:1.83 Sat Feb 27 14:30:33 2016
+++ src/sys/kern/kern_rndq.c Sun Feb 28 20:20:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.83 2016/02/27 14:30:33 mlelstv Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.84 2016/02/28 20:20:17 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.83 2016/02/27 14:30:33 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.84 2016/02/28 20:20:17 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -260,6 +260,10 @@ rnd_getmore(size_t byteswanted)
mutex_spin_enter(&rnd_global.lock);
LIST_FOREACH_SAFE(rs, &rnd_global.sources, list, next) {
+ /* Skip if the source is disabled. */
+ if (!RND_ENABLED(rs))
+ continue;
+
/* Skip if there's no callback. */
if (!ISSET(rs->flags, RND_FLAG_HASCB))
continue;
