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

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
parents b42bc9a3 c6ce9c58

crypto/algapi.c

+1 −0
Original line number Diff line number Diff line
@@ -1324,3 +1324,4 @@ module_exit(crypto_algapi_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Cryptographic algorithms API");

MODULE_SOFTDEP("pre: cryptomgr");

crypto/api.c

+0 −1
Original line number Diff line number Diff line
@@ -643,4 +643,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done); 


MODULE_DESCRIPTION("Cryptographic core API");

MODULE_LICENSE("GPL");
 
MODULE_SOFTDEP("pre: cryptomgr");

drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c

+2 −1
Original line number Diff line number Diff line
@@ -1753,7 +1753,6 @@ void otx2_cpt_print_uc_dbg_info(struct otx2_cptpf_dev *cptpf) 
	char engs_info[2 * OTX2_CPT_NAME_LENGTH];

	struct otx2_cpt_eng_grp_info *grp;

	struct otx2_cpt_engs_rsvd *engs;

	u32 mask[4];

	int i, j;



	pr_debug("Engine groups global info");
@@ -1785,6 +1784,8 @@ void otx2_cpt_print_uc_dbg_info(struct otx2_cptpf_dev *cptpf) 
		for (j = 0; j < OTX2_CPT_MAX_ETYPES_PER_GRP; j++) {

			engs = &grp->engs[j];

			if (engs->type) {

				u32 mask[5] = { };



				get_engs_info(grp, engs_info,

					      2 * OTX2_CPT_NAME_LENGTH, j);

				pr_debug("Slot%d: %s", j, engs_info);