From: Jorge Ramirez-Ortiz <jorge@foundries.io>
To: jorge@foundries.io, sumit.garg@linaro.org, mpm@selenic.com,
herbert@gondor.apana.org.au
Cc: jens.wiklander@linaro.org, arnd@arndb.de, ricardo@foundries.io,
mike@foundries.io, gregkh@linuxfoundation.org,
op-tee@lists.trustedfirmware.org, linux-crypto@vger.kernel.org
Subject: [PATCH 2/2] hwrng: optee: fix wait use case
Date: Thu, 23 Jul 2020 10:28:21 +0200 [thread overview]
Message-ID: <20200723082821.26237-2-jorge@foundries.io> (raw)
In-Reply-To: <20200723082821.26237-1-jorge@foundries.io>
The current code waits for data to be available before attempting a
second read. However the second read would not be executed as the
while loop exits.
This fix does not wait if all data has been read and reads a second
time if only partial data was retrieved on the first read.
Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io>
---
drivers/char/hw_random/optee-rng.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/char/hw_random/optee-rng.c b/drivers/char/hw_random/optee-rng.c
index 5bc4700c4dae..967d58bb9fda 100644
--- a/drivers/char/hw_random/optee-rng.c
+++ b/drivers/char/hw_random/optee-rng.c
@@ -122,13 +122,15 @@ static int optee_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)
if (max > MAX_ENTROPY_REQ_SZ)
max = MAX_ENTROPY_REQ_SZ;
- while (read == 0) {
+ for (;;) {
rng_size = get_optee_rng_data(pvt_data, data, (max - read));
data += rng_size;
read += rng_size;
if (wait && pvt_data->data_rate) {
+ if (read == max)
+ return read;
if (timeout-- == 0)
return read;
msleep((1000 * (max - read)) / pvt_data->data_rate);
--
2.17.1
prev parent reply other threads:[~2020-07-23 8:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 8:28 [PATCH 1/2] hwrng: optee: handle unlimited data rates Jorge Ramirez-Ortiz
2020-07-23 8:28 ` Jorge Ramirez-Ortiz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723082821.26237-2-jorge@foundries.io \
--to=jorge@foundries.io \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=jens.wiklander@linaro.org \
--cc=linux-crypto@vger.kernel.org \
--cc=mike@foundries.io \
--cc=mpm@selenic.com \
--cc=op-tee@lists.trustedfirmware.org \
--cc=ricardo@foundries.io \
--cc=sumit.garg@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).