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

torvalds · torvalds · commit 3d7285a335ed · 2022-05-19T20:04:17.000-10:00
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
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ static int qcom_rng_read(struct qcom_rng rng, u8 data, unsigned int max)`
`65`	`65`	`} else {`
`66`	`66`	`/* copy only remaining bytes */`
`67`	`67`	`memcpy(data, &val, max - currsize);`
	`68`	`+ break;`
`68`	`69`	`}`
`69`	`70`	`} while (currsize < max);`
`70`	`71`