Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

bbb8ceb5 · Linus Torvalds <[email protected]> · 2022-10-17 10:20:04 -07:00

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()

Commit: bbb8ceb5e2421184db9560e9d2cfaf858e1db616
Parents: 9abf2313 · 96cb9d05

Merge commit. Changes below are compared with the first parent: 9abf2313.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/char/hw_random/bcm2835-rng.c	modified	+1	−1	View file

drivers/char/hw_random/bcm2835-rng.c

View file

diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
index e7dd457..e98fcac 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;