diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-17 10:20:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-17 10:20:04 -0700 |
| commit | bbb8ceb5e2421184db9560e9d2cfaf858e1db616 (patch) | |
| tree | 2b71d79b9fdc479cd5800834864e208099b7f07b /drivers/char | |
| parent | 9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff) | |
| parent | 96cb9d0554457086664d3bd10630b11193d863f1 (diff) | |
| download | linux-bbb8ceb5e2421184db9560e9d2cfaf858e1db616.tar.gz linux-bbb8ceb5e2421184db9560e9d2cfaf858e1db616.tar.bz2 linux-bbb8ceb5e2421184db9560e9d2cfaf858e1db616.zip | |
Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes an issue exposed by the recent change to feed untrusted
sources into /dev/random"
* tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
hwrng: bcm2835 - use hwrng_msleep() instead of cpu_relax()
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/bcm2835-rng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index e7dd457e9b22..e98fcac578d6 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -71,7 +71,7 @@ static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max, while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) { if (!wait) return 0; - cpu_relax(); + hwrng_msleep(rng, 1000); } num_words = rng_readl(priv, RNG_STATUS) >> 24; |