crypto: chelsio - Fix wrong error counter increments

Harsh Jain · herbertx · commit f31ba0f95f19 · 2018-12-23T11:52:43.000+08:00
Fix error counter increment in AEAD decrypt operation when
validation of tag is done in Driver instead of H/W.

Signed-off-by: Harsh Jain &lt;harsh@chelsio.com&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
@@ -218,7 +218,7 @@ static inline void chcr_dec_wrcount(struct chcr_dev *dev)
 	atomic_dec(&dev->inflight);
 }
 
-static inline void chcr_handle_aead_resp(struct aead_request *req,
+static inline int chcr_handle_aead_resp(struct aead_request *req,
 					 unsigned char *input,
 					 int err)
 {
@@ -233,6 +233,8 @@ static inline void chcr_handle_aead_resp(struct aead_request *req,
 	}
 	chcr_dec_wrcount(dev);
 	req->base.complete(&req->base, err);
+
+	return err;
 }
 
 static void get_aes_decrypt_key(unsigned char *dec_key,
@@ -2072,14 +2074,13 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input,
 
 	switch (tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK) {
 	case CRYPTO_ALG_TYPE_AEAD:
-		chcr_handle_aead_resp(aead_request_cast(req), input, err);
+		err = chcr_handle_aead_resp(aead_request_cast(req), input, err);
 		break;
 
 	case CRYPTO_ALG_TYPE_ABLKCIPHER:
-		 err = chcr_handle_cipher_resp(ablkcipher_request_cast(req),
+		 chcr_handle_cipher_resp(ablkcipher_request_cast(req),
 					       input, err);
 		break;
-
 	case CRYPTO_ALG_TYPE_AHASH:
 		chcr_handle_ahash_resp(ahash_request_cast(req), input, err);
 		}
diff --git a/drivers/crypto/chelsio/chcr_core.c b/drivers/crypto/chelsio/chcr_core.c
@@ -169,19 +169,18 @@ static int cpl_fw6_pld_handler(struct chcr_dev *dev,
 
 	ack_err_status =
 		ntohl(*(__be32 *)((unsigned char *)&fw6_pld->data[0] + 4));
-	if (ack_err_status) {
-		if (CHK_MAC_ERR_BIT(ack_err_status) ||
-		    CHK_PAD_ERR_BIT(ack_err_status))
-			error_status = -EBADMSG;
-		atomic_inc(&adap->chcr_stats.error);
-	}
+	if (CHK_MAC_ERR_BIT(ack_err_status) || CHK_PAD_ERR_BIT(ack_err_status))
+		error_status = -EBADMSG;
 	/* call completion callback with failure status */
 	if (req) {
 		error_status = chcr_handle_resp(req, input, error_status);
 	} else {
 		pr_err("Incorrect request address from the firmware\n");
 		return -EFAULT;
 	}
+	if (error_status)
+		atomic_inc(&adap->chcr_stats.error);
+
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ static inline void chcr_dec_wrcount(struct chcr_dev *dev)`
`218`	`218`	`atomic_dec(&dev->inflight);`
`219`	`219`	`}`
`220`	`220`
`221`		`-static inline void chcr_handle_aead_resp(struct aead_request *req,`
	`221`	`+static inline int chcr_handle_aead_resp(struct aead_request *req,`
`222`	`222`	`unsigned char *input,`
`223`	`223`	`int err)`
`224`	`224`	`{`
`@@ -233,6 +233,8 @@ static inline void chcr_handle_aead_resp(struct aead_request *req,`
`233`	`233`	`}`
`234`	`234`	`chcr_dec_wrcount(dev);`
`235`	`235`	`req->base.complete(&req->base, err);`
	`236`	`+`
	`237`	`+ return err;`
`236`	`238`	`}`
`237`	`239`
`238`	`240`	`static void get_aes_decrypt_key(unsigned char *dec_key,`
`@@ -2072,14 +2074,13 @@ int chcr_handle_resp(struct crypto_async_request req, unsigned char input,`
`2072`	`2074`
`2073`	`2075`	`switch (tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK) {`
`2074`	`2076`	`case CRYPTO_ALG_TYPE_AEAD:`
`2075`		`- chcr_handle_aead_resp(aead_request_cast(req), input, err);`
	`2077`	`+ err = chcr_handle_aead_resp(aead_request_cast(req), input, err);`
`2076`	`2078`	`break;`
`2077`	`2079`
`2078`	`2080`	`case CRYPTO_ALG_TYPE_ABLKCIPHER:`
`2079`		`- err = chcr_handle_cipher_resp(ablkcipher_request_cast(req),`
	`2081`	`+ chcr_handle_cipher_resp(ablkcipher_request_cast(req),`
`2080`	`2082`	`input, err);`
`2081`	`2083`	`break;`
`2082`		`-`
`2083`	`2084`	`case CRYPTO_ALG_TYPE_AHASH:`
`2084`	`2085`	`chcr_handle_ahash_resp(ahash_request_cast(req), input, err);`
`2085`	`2086`	`}`