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

torvalds · torvalds · commit bbb8ceb5e242 · 2022-10-17T10:20:04.000-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()
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static int bcm2835_rng_read(struct hwrng rng, void buf, size_t max,`
`71`	`71`	`while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {`
`72`	`72`	`if (!wait)`
`73`	`73`	`return 0;`
`74`		`- cpu_relax();`
	`74`	`+ hwrng_msleep(rng, 1000);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`num_words = rng_readl(priv, RNG_STATUS) >> 24;`