mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
98 lines
2.4 KiB
Diff
98 lines
2.4 KiB
Diff
From 5b3c92a29bbbcfe5a1ef24422a6b0ff5025b488c Mon Sep 17 00:00:00 2001
|
|
From: Greg Price <price@MIT.EDU>
|
|
Date: Fri, 29 Nov 2013 15:02:33 -0500
|
|
Subject: [PATCH 2/5] random: simplify loop in random_read
|
|
|
|
The loop condition never changes until just before a break, so we
|
|
might as well write it as a constant. Also since a996996dd75a
|
|
("random: drop weird m_time/a_time manipulation") we don't do anything
|
|
after the loop finishes, so the 'break's might as well return
|
|
directly. Some other simplifications.
|
|
|
|
There should be no change in behavior introduced by this commit.
|
|
|
|
Signed-off-by: Greg Price <price@mit.edu>
|
|
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
|
---
|
|
drivers/char/random.c | 57 ++++++++++++++++-----------------------------------
|
|
1 file changed, 18 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/drivers/char/random.c b/drivers/char/random.c
|
|
index a35a605c418a..b3b5e036087b 100644
|
|
--- a/drivers/char/random.c
|
|
+++ b/drivers/char/random.c
|
|
@@ -1287,53 +1287,32 @@ void rand_initialize_disk(struct gendisk *disk)
|
|
static ssize_t
|
|
random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
|
|
{
|
|
- ssize_t n, retval = 0, count = 0;
|
|
+ ssize_t n;
|
|
|
|
if (nbytes == 0)
|
|
return 0;
|
|
|
|
- while (nbytes > 0) {
|
|
- n = nbytes;
|
|
- if (n > SEC_XFER_SIZE)
|
|
- n = SEC_XFER_SIZE;
|
|
-
|
|
- n = extract_entropy_user(&blocking_pool, buf, n);
|
|
-
|
|
- if (n < 0) {
|
|
- retval = n;
|
|
- break;
|
|
- }
|
|
-
|
|
+ nbytes = min_t(size_t, nbytes, SEC_XFER_SIZE);
|
|
+ while (1) {
|
|
+ n = extract_entropy_user(&blocking_pool, buf, nbytes);
|
|
+ if (n < 0)
|
|
+ return n;
|
|
trace_random_read(n*8, (nbytes-n)*8,
|
|
ENTROPY_BITS(&blocking_pool),
|
|
ENTROPY_BITS(&input_pool));
|
|
-
|
|
- if (n == 0) {
|
|
- if (file->f_flags & O_NONBLOCK) {
|
|
- retval = -EAGAIN;
|
|
- break;
|
|
- }
|
|
-
|
|
- wait_event_interruptible(random_read_wait,
|
|
- ENTROPY_BITS(&input_pool) >=
|
|
- random_read_wakeup_thresh);
|
|
-
|
|
- if (signal_pending(current)) {
|
|
- retval = -ERESTARTSYS;
|
|
- break;
|
|
- }
|
|
-
|
|
- continue;
|
|
- }
|
|
-
|
|
- count += n;
|
|
- buf += n;
|
|
- nbytes -= n;
|
|
- break; /* This break makes the device work */
|
|
- /* like a named pipe */
|
|
+ if (n > 0)
|
|
+ return n;
|
|
+ /* Pool is (near) empty. Maybe wait and retry. */
|
|
+
|
|
+ if (file->f_flags & O_NONBLOCK)
|
|
+ return -EAGAIN;
|
|
+
|
|
+ wait_event_interruptible(random_read_wait,
|
|
+ ENTROPY_BITS(&input_pool) >=
|
|
+ random_read_wakeup_thresh);
|
|
+ if (signal_pending(current))
|
|
+ return -ERESTARTSYS;
|
|
}
|
|
-
|
|
- return (count ? count : retval);
|
|
}
|
|
|
|
static ssize_t
|
|
--
|
|
2.12.2
|
|
|