diff options
| author | Ondrej Mosnacek <omosnace@redhat.com> | 2022-05-03 13:50:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-25 09:17:56 +0200 |
| commit | 233a3cc60e7a8fe0be8cf9934ae7b67ba25a866c (patch) | |
| tree | 1635846424ebf7321e32f3b5d280e73a3844a3ba /drivers/crypto | |
| parent | 6013ef5f51e0861a904b74a694e621bb451fe7ae (diff) | |
| download | linux-stable-233a3cc60e7a8fe0be8cf9934ae7b67ba25a866c.tar.gz linux-stable-233a3cc60e7a8fe0be8cf9934ae7b67ba25a866c.tar.bz2 linux-stable-233a3cc60e7a8fe0be8cf9934ae7b67ba25a866c.zip | |
crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
commit 16287397ec5c08aa58db6acf7dbc55470d78087d upstream.
The commit referenced in the Fixes tag removed the 'break' from the else
branch in qcom_rng_read(), causing an infinite loop whenever 'max' is
not a multiple of WORD_SZ. This can be reproduced e.g. by running:
kcapi-rng -b 67 >/dev/null
There are many ways to fix this without adding back the 'break', but
they all seem more awkward than simply adding it back, so do just that.
Tested on a machine with Qualcomm Amberwing processor.
Fixes: a680b1832ced ("crypto: qcom-rng - ensure buffer for generate is completely filled")
Cc: stable@vger.kernel.org
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Reviewed-by: Brian Masney <bmasney@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/qcom-rng.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c index 11f30fd48c14..031b5f701a0a 100644 --- a/drivers/crypto/qcom-rng.c +++ b/drivers/crypto/qcom-rng.c @@ -65,6 +65,7 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) } else { /* copy only remaining bytes */ memcpy(data, &val, max - currsize); + break; } } while (currsize < max); |