diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 20:04:17 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-19 20:04:17 -1000 |
| commit | 3d7285a335edaf23b699e87c528cf0b0070e3293 (patch) | |
| tree | 8753bade9f5d4448848ac1c46e3312b0233ebc1b /drivers | |
| parent | Merge tag 'for-5.18/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ (diff) | |
Merge tag 'v5.18-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"Fix a regression in a recent fix to qcom-rng"
* tag 'v5.18-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ
Diffstat (limited to 'drivers')
| -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); |