Module Name: src
Committed By: riastradh
Date: Wed Jan 13 23:54:21 UTC 2021
Modified Files:
src/sys/dev: random.c
Log Message:
/dev/random: Fix nonblocking read.
The flag passed to cdev_read is IO_NDELAY, not FNONBLOCK/O_NONBLOCK,
and although the latter two coincide, IO_NDELAY has a different
value.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/random.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/dev/random.c
diff -u src/sys/dev/random.c:1.8 src/sys/dev/random.c:1.9
--- src/sys/dev/random.c:1.8 Fri Aug 14 00:53:16 2020
+++ src/sys/dev/random.c Wed Jan 13 23:54:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: random.c,v 1.8 2020/08/14 00:53:16 riastradh Exp $ */
+/* $NetBSD: random.c,v 1.9 2021/01/13 23:54:21 riastradh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: random.c,v 1.8 2020/08/14 00:53:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: random.c,v 1.9 2021/01/13 23:54:21 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: random.c,v 1
#include <sys/rndsource.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
+#include <sys/vnode.h> /* IO_NDELAY */
#include "ioconf.h"
@@ -222,8 +223,11 @@ random_read(dev_t dev, struct uio *uio,
return ENXIO;
}
- /* Set GRND_NONBLOCK if the user requested FNONBLOCK. */
- if (flags & FNONBLOCK)
+ /*
+ * Set GRND_NONBLOCK if the user requested IO_NDELAY (i.e., the
+ * file was opened with O_NONBLOCK).
+ */
+ if (flags & IO_NDELAY)
gflags |= GRND_NONBLOCK;
/* Defer to getrandom. */
