Skip to contentSkip to conversation

hw_random core: block read, if !O_NONBLOCK

PATCH New Michael Buesch 1 participant 1 message May 26, 2006 Hardware random number generator core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw_random core: block read, if !O_NONBLOCK

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 [email protected] for pointing out the issue.

drivers/char/hw_random/core.c +4 -1
Index: hwrng.fixes/drivers/char/hw_random/core.c
===================================================================
@@ -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;
 	}