* [PATCH] hw_random core: block read, if !O_NONBLOCK
@ 2006-05-26 22:45 Michael Buesch
0 siblings, 0 replies; only message in thread
From: Michael Buesch @ 2006-05-26 22:45 UTC (permalink / raw)
To: Andrew Morton; +Cc: Valdis.Kletnieks, linux-kernel
Please apply this to -mm. It might also be desireable
to queue the whole hw_random rewrite for 2.6.18 after this
fix is merged.
--
Block reads to /dev/hwrng if O_NONBLOCK is not set.
This restores the old behavior, to not break userland (rngd).
Thanks to Valdis.Kletnieks@vt.edu for pointing out the issue.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Index: hwrng.fixes/drivers/char/hw_random/core.c
===================================================================
--- hwrng.fixes.orig/drivers/char/hw_random/core.c 2006-05-16 21:52:47.000000000 +0200
+++ hwrng.fixes/drivers/char/hw_random/core.c 2006-05-27 00:39:08.000000000 +0200
@@ -125,7 +125,7 @@
mutex_unlock(&rng_mutex);
err = -EAGAIN;
- if (!bytes_read)
+ if (!bytes_read && (filp->f_flags & O_NONBLOCK))
goto out;
err = -EFAULT;
@@ -138,6 +138,9 @@
data >>= 8;
}
+ if (need_resched())
+ schedule_timeout_interruptible(1);
+ err = -ERESTARTSYS;
if (signal_pending(current))
goto out;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-05-26 22:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-26 22:45 [PATCH] hw_random core: block read, if !O_NONBLOCK Michael Buesch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox