Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This push fixes a regression in the caam driver and af_alg.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmTfSHAACgkQxycdCkmx
 i6eK6g/+KQbOmERuZo9mpv02eM8f8zZsKZqwsQ9NkLGLbMXnVCzUuaFe6PtviSRY
 GyIsMIiO1gQJ8N/67BskmJHJjrszK/hieoTT0gvyibK4sFfe0Bw6S2naOS2z8nTk
 oTUykT9L2FPIAHlK8noVXDJWMiaoofSXkAaHKHYodESJqy7ZjA4h3CDLF4asO3Ze
 cd5Mfyxc9Q3vlJRpsuPfOuYDCVXFxMJz83vyp2y4eKJ7z+IjD/Zxk+FS1aMS68c/
 0/p8Qcda4kf6DEfM9cwZIWlY21JnsFBE0BzVfA/Sbol+MccO++xQr57/LblTXCQt
 xOxq7tfEC6WdJLPAm8XKn6hXX+48DhIWSKsu0I6bfVzHSw3b/Wfe1IidgYD5zMbq
 ecLrLx7AqJAc7UrMKHXoQz+8OZZZ8qb5VE3zamEWtNAGiJFmjhGfLvw+j/FQ49/W
 lDuYzvH9fTkm8ebGKF0z7KA5fBOSzei9IdOIuFNjPORVACcmhNi0FfQfhjeqOimy
 y+gYa60M/5APIywDiJkFdLw+2puolf/VvNyxrGehMdfZUi1HCPyxjjab9OgzczU8
 hz5xj5q3/BUCma9CVBCJ/6rY3KHOdJTItm4q5IuAC4nUGTFA/IbZtR40ULWz+Qoz
 yPPEmnyZEd6tWsRm+Gh1Qzgb/mPJ8mdmcB+4QnwmAJkkukp7MLI=
 =1DNA
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2023-08-21 07:02:21 +02:00
commit f7757129e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/af_alg.c
View File

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

4
drivers/crypto/caam/ctrl.c
View File

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