Commit f7757129 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fixes from Herbert Xu:
 "Fix a regression in the caam driver and af_alg"

* tag 'v6.5-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: fix uninit-value in af_alg_free_resources
  Revert "crypto: caam - adjust RNG timing to support more devices"
parents 4542057e 080aa61e

crypto/af_alg.c

+2 −2
Original line number Diff line number Diff line
@@ -1241,6 +1241,8 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags, 
				return -ENOMEM;

		}



		rsgl->sgl.need_unpin =

			iov_iter_extract_will_pin(&msg->msg_iter);

		rsgl->sgl.sgt.sgl = rsgl->sgl.sgl;

		rsgl->sgl.sgt.nents = 0;

		rsgl->sgl.sgt.orig_nents = 0;
@@ -1255,8 +1257,6 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags, 
		}



		sg_mark_end(rsgl->sgl.sgt.sgl + rsgl->sgl.sgt.nents - 1);

		rsgl->sgl.need_unpin =

			iov_iter_extract_will_pin(&msg->msg_iter);



		/* chain the new scatterlist with previous one */

		if (areq->last_rsgl)

drivers/crypto/caam/ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -382,8 +382,8 @@ static void kick_trng(struct device *dev, int ent_delay) 
		val = ent_delay;

		/* min. freq. count, equal to 1/4 of the entropy sample length */

		wr_reg32(&r4tst->rtfrqmin, val >> 2);

		/* max. freq. count, equal to 16 times the entropy sample length */

		wr_reg32(&r4tst->rtfrqmax, val << 4);

		/* disable maximum frequency count */

		wr_reg32(&r4tst->rtfrqmax, RTFRQMAX_DISABLE);

	}



	wr_reg32(&r4tst->rtsdctl, (val << RTSDCTL_ENT_DLY_SHIFT) |