Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
+4
-4
+2
-2
crypto/af_alg.c
+2
-2
crypto/af_alg.c
···
1241
1241
return -ENOMEM;
1242
1242
}
1243
1243
1244
+
rsgl->sgl.need_unpin =
1245
+
iov_iter_extract_will_pin(&msg->msg_iter);
1244
1246
rsgl->sgl.sgt.sgl = rsgl->sgl.sgl;
1245
1247
rsgl->sgl.sgt.nents = 0;
1246
1248
rsgl->sgl.sgt.orig_nents = 0;
···
1257
1255
}
1258
1256
1259
1257
sg_mark_end(rsgl->sgl.sgt.sgl + rsgl->sgl.sgt.nents - 1);
1260
-
rsgl->sgl.need_unpin =
1261
-
iov_iter_extract_will_pin(&msg->msg_iter);
1262
1258
1263
1259
/* chain the new scatterlist with previous one */
1264
1260
if (areq->last_rsgl)
+2
-2
drivers/crypto/caam/ctrl.c
+2
-2
drivers/crypto/caam/ctrl.c
···
382
382
val = ent_delay;
383
383
/* min. freq. count, equal to 1/4 of the entropy sample length */
384
384
wr_reg32(&r4tst->rtfrqmin, val >> 2);
385
-
/* max. freq. count, equal to 16 times the entropy sample length */
386
-
wr_reg32(&r4tst->rtfrqmax, val << 4);
385
+
/* disable maximum frequency count */
386
+
wr_reg32(&r4tst->rtfrqmax, RTFRQMAX_DISABLE);
387
387
}
388
388
389
389
wr_reg32(&r4tst->rtsdctl, (val << RTSDCTL_ENT_DLY_SHIFT) |