Skip to contentSkip to conversation

crypto: octeontx2 - out of bounds access in otx2_cpt_dl_custom_egrp_delete()

PATCH In review Dan Carpenter 2 participants 3 messages Dec 17, 2021 – Dec 24, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 crypto: octeontx2 - out of bounds access in otx2_cpt_dl_custom_egrp_delete()

If "egrp" is negative then it is causes an out of bounds access in eng_grps->grp[].

Fixes d9d7749773e8 ("crypto: octeontx2 - add apis for custom engine groups")
---
 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +1 -1
index 57307eac541c..07f28d887c2c 100644
@@ -1695,7 +1695,7 @@ int otx2_cpt_dl_custom_egrp_delete(struct otx2_cptpf_dev *cptpf,
 	if (kstrtoint(tmp, 10, &egrp))
 		goto err_print;
 
-	if (egrp >= OTX2_CPT_MAX_ENGINE_GROUPS) {
+	if (egrp < 0 || egrp >= OTX2_CPT_MAX_ENGINE_GROUPS) {
 		dev_err(dev, "Invalid engine group %d", egrp);
 		return -EINVAL;
 	}
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 crypto: octeontx2 - prevent underflow in get_cores_bmap()

If we're going to cap "eng_grp->g->engs_num" upper bounds then we should cap the lower bounds as well.

Fixes 43ac0b824f1c ("crypto: octeontx2 - load microcode and create engine groups")
---
 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +2 -1
index 07f28d887c2c..392a78298398 100644
@@ -29,7 +29,8 @@ static struct otx2_cpt_bitmap get_cores_bmap(struct device *dev,
 	bool found = false;
 	int i;
 
-	if (eng_grp->g->engs_num > OTX2_CPT_MAX_ENGINES) {
+	if (eng_grp->g->engs_num < 0 ||
+	    eng_grp->g->engs_num > OTX2_CPT_MAX_ENGINES) {
 		dev_err(dev, "unsupported number of engines %d on octeontx2\n",
 			eng_grp->g->engs_num);
 		return bmap;
Signature · 1 line
2.20.1
maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 8 lines · Dan Carpenter

If "egrp" is negative then it is causes an out of bounds access in eng_grps->grp[].

Fixes d9d7749773e8 ("crypto: octeontx2 - add apis for custom engine groups")
---
 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

All applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt