tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
"Fix two regressions:

- Potential boot failure due to missing cryptomgr on initramfs

- Stack overflow in octeontx2"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Move cryptomgr soft dependency into algapi
crypto: octeontx2 - Avoid stack variable overflow

Linus Torvalds f9f94c9d b42bc9a3

+3 -2
+1
crypto/algapi.c
··· 1324 1324 1325 1325 MODULE_LICENSE("GPL"); 1326 1326 MODULE_DESCRIPTION("Cryptographic algorithms API"); 1327 + MODULE_SOFTDEP("pre: cryptomgr");
-1
crypto/api.c
··· 643 643 644 644 MODULE_DESCRIPTION("Cryptographic core API"); 645 645 MODULE_LICENSE("GPL"); 646 - MODULE_SOFTDEP("pre: cryptomgr");
+2 -1
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
··· 1753 1753 char engs_info[2 * OTX2_CPT_NAME_LENGTH]; 1754 1754 struct otx2_cpt_eng_grp_info *grp; 1755 1755 struct otx2_cpt_engs_rsvd *engs; 1756 - u32 mask[4]; 1757 1756 int i, j; 1758 1757 1759 1758 pr_debug("Engine groups global info"); ··· 1784 1785 for (j = 0; j < OTX2_CPT_MAX_ETYPES_PER_GRP; j++) { 1785 1786 engs = &grp->engs[j]; 1786 1787 if (engs->type) { 1788 + u32 mask[5] = { }; 1789 + 1787 1790 get_engs_info(grp, engs_info, 1788 1791 2 * OTX2_CPT_NAME_LENGTH, j); 1789 1792 pr_debug("Slot%d: %s", j, engs_info);