test/crypto: fix null dereference for crypto op
diff mbox series

Message ID 20201030131126.222553-1-ciara.power@intel.com
State Accepted
Delegated to: akhil goyal
Headers show
Series
  • test/crypto: fix null dereference for crypto op
Related show

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/checkpatch success coding style OK

Commit Message

Ciara Power Oct. 30, 2020, 1:11 p.m. UTC
In two test cases, the op value is set by the return of the
process_crypto_request function, which may be NULL. The op->status
value was checked afterwards, which was causing a dereference issue.

To fix this, a temporary op variable is used to hold the return
from the process_crypto_request function, so the original op->status
can be checked after the possible NULL return value.
The original op value is then set to hold the temporary op value.

Coverity issue: 363465
Coverity issue: 363452
Fixes: 4868f6591c6f ("test/crypto: add cases for raw datapath API")
Cc: roy.fan.zhang@intel.com

Signed-off-by: Ciara Power <ciara.power@intel.com>
---
 app/test/test_cryptodev.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Akhil Goyal Nov. 2, 2020, 7:55 p.m. UTC | #1
> Subject: [dpdk-dev] [PATCH] test/crypto: fix null dereference for crypto op
> 
> In two test cases, the op value is set by the return of the
> process_crypto_request function, which may be NULL. The op->status
> value was checked afterwards, which was causing a dereference issue.
> 
> To fix this, a temporary op variable is used to hold the return
> from the process_crypto_request function, so the original op->status
> can be checked after the possible NULL return value.
> The original op value is then set to hold the temporary op value.
> 
> Coverity issue: 363465
> Coverity issue: 363452
> Fixes: 4868f6591c6f ("test/crypto: add cases for raw datapath API")
> Cc: roy.fan.zhang@intel.com
> 
> Signed-off-by: Ciara Power <ciara.power@intel.com>
> ---
>  app/test/test_cryptodev.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
> index 0fed124d3a..ce8bcd1d4f 100644
> --- a/app/test/test_cryptodev.c
> +++ b/app/test/test_cryptodev.c
> @@ -6676,6 +6676,7 @@ test_mixed_auth_cipher(const struct
> mixed_cipher_auth_test_data *tdata,
>  	unsigned int ciphertext_len;
> 
>  	struct rte_cryptodev_info dev_info;
> +	struct rte_crypto_op *op;
> 
>  	/* Check if device supports particular algorithms separately */
>  	if (test_mixed_check_if_unsupported(tdata))
> @@ -6771,17 +6772,17 @@ test_mixed_auth_cipher(const struct
> mixed_cipher_auth_test_data *tdata,
>  	if (retval < 0)
>  		return retval;
> 
> -	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
> -			ut_params->op);
> +	op = process_crypto_request(ts_params->valid_devs[0], ut_params-
> >op);
> 
>  	/* Check if the op failed because the device doesn't */
>  	/* support this particular combination of algorithms */
> -	if (ut_params->op == NULL && ut_params->op->status ==
> +	if (op == NULL && ut_params->op->status ==
>  			RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
>  		printf("Device doesn't support this mixed combination. "
>  				"Test Skipped.\n");
>  		return -ENOTSUP;
>  	}

I believe the original check was also good. But instead of 
if (ut_params->op == NULL && ut_params->op->status == RTE_CRYPTO_OP_STATUS_INVALID_SESSION)
it should be
if (ut_params->op == NULL || ut_params->op->status == RTE_CRYPTO_OP_STATUS_INVALID_SESSION)

In this way the coverity should not raise an issue for this. What say?

> +	ut_params->op = op;
> 
>  	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
> 
> @@ -6872,6 +6873,7 @@ test_mixed_auth_cipher_sgl(const struct
> mixed_cipher_auth_test_data *tdata,
>  	uint8_t digest_buffer[10000];
> 
>  	struct rte_cryptodev_info dev_info;
> +	struct rte_crypto_op *op;
> 
>  	/* Check if device supports particular algorithms */
>  	if (test_mixed_check_if_unsupported(tdata))
> @@ -6976,17 +6978,17 @@ test_mixed_auth_cipher_sgl(const struct
> mixed_cipher_auth_test_data *tdata,
>  	if (retval < 0)
>  		return retval;
> 
> -	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
> -			ut_params->op);
> +	op = process_crypto_request(ts_params->valid_devs[0], ut_params-
> >op);
> 
>  	/* Check if the op failed because the device doesn't */
>  	/* support this particular combination of algorithms */
> -	if (ut_params->op == NULL && ut_params->op->status ==
> +	if (op == NULL && ut_params->op->status ==
>  			RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
>  		printf("Device doesn't support this mixed combination. "
>  				"Test Skipped.\n");
>  		return -ENOTSUP;
>  	}
> +	ut_params->op = op;
> 
>  	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
> 
> --
> 2.25.1
Akhil Goyal Nov. 4, 2020, 7:16 a.m. UTC | #2
> > Subject: [dpdk-dev] [PATCH] test/crypto: fix null dereference for crypto op
> >
> > In two test cases, the op value is set by the return of the
> > process_crypto_request function, which may be NULL. The op->status
> > value was checked afterwards, which was causing a dereference issue.
> >
> > To fix this, a temporary op variable is used to hold the return
> > from the process_crypto_request function, so the original op->status
> > can be checked after the possible NULL return value.
> > The original op value is then set to hold the temporary op value.
> >
> > Coverity issue: 363465
> > Coverity issue: 363452
> > Fixes: 4868f6591c6f ("test/crypto: add cases for raw datapath API")
> > Cc: roy.fan.zhang@intel.com
> >
> > Signed-off-by: Ciara Power <ciara.power@intel.com>
> > ---
> >  app/test/test_cryptodev.c | 14 ++++++++------
> >  1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
> > index 0fed124d3a..ce8bcd1d4f 100644
> > --- a/app/test/test_cryptodev.c
> > +++ b/app/test/test_cryptodev.c
> > @@ -6676,6 +6676,7 @@ test_mixed_auth_cipher(const struct
> > mixed_cipher_auth_test_data *tdata,
> >  	unsigned int ciphertext_len;
> >
> >  	struct rte_cryptodev_info dev_info;
> > +	struct rte_crypto_op *op;
> >
> >  	/* Check if device supports particular algorithms separately */
> >  	if (test_mixed_check_if_unsupported(tdata))
> > @@ -6771,17 +6772,17 @@ test_mixed_auth_cipher(const struct
> > mixed_cipher_auth_test_data *tdata,
> >  	if (retval < 0)
> >  		return retval;
> >
> > -	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
> > -			ut_params->op);
> > +	op = process_crypto_request(ts_params->valid_devs[0], ut_params-
> > >op);
> >
> >  	/* Check if the op failed because the device doesn't */
> >  	/* support this particular combination of algorithms */
> > -	if (ut_params->op == NULL && ut_params->op->status ==
> > +	if (op == NULL && ut_params->op->status ==
> >  			RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
> >  		printf("Device doesn't support this mixed combination. "
> >  				"Test Skipped.\n");
> >  		return -ENOTSUP;
> >  	}
> 
> I believe the original check was also good. But instead of
> if (ut_params->op == NULL && ut_params->op->status ==
> RTE_CRYPTO_OP_STATUS_INVALID_SESSION)
> it should be
> if (ut_params->op == NULL || ut_params->op->status ==
> RTE_CRYPTO_OP_STATUS_INVALID_SESSION)
> 
> In this way the coverity should not raise an issue for this. What say?
> 

Please disregard my comment. The patch is good.
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>

Applied to dpdk-next-crypto

Thanks.

Patch
diff mbox series

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 0fed124d3a..ce8bcd1d4f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6676,6 +6676,7 @@  test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
 	unsigned int ciphertext_len;
 
 	struct rte_cryptodev_info dev_info;
+	struct rte_crypto_op *op;
 
 	/* Check if device supports particular algorithms separately */
 	if (test_mixed_check_if_unsupported(tdata))
@@ -6771,17 +6772,17 @@  test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
 	if (retval < 0)
 		return retval;
 
-	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-			ut_params->op);
+	op = process_crypto_request(ts_params->valid_devs[0], ut_params->op);
 
 	/* Check if the op failed because the device doesn't */
 	/* support this particular combination of algorithms */
-	if (ut_params->op == NULL && ut_params->op->status ==
+	if (op == NULL && ut_params->op->status ==
 			RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
 		printf("Device doesn't support this mixed combination. "
 				"Test Skipped.\n");
 		return -ENOTSUP;
 	}
+	ut_params->op = op;
 
 	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
@@ -6872,6 +6873,7 @@  test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
 	uint8_t digest_buffer[10000];
 
 	struct rte_cryptodev_info dev_info;
+	struct rte_crypto_op *op;
 
 	/* Check if device supports particular algorithms */
 	if (test_mixed_check_if_unsupported(tdata))
@@ -6976,17 +6978,17 @@  test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
 	if (retval < 0)
 		return retval;
 
-	ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-			ut_params->op);
+	op = process_crypto_request(ts_params->valid_devs[0], ut_params->op);
 
 	/* Check if the op failed because the device doesn't */
 	/* support this particular combination of algorithms */
-	if (ut_params->op == NULL && ut_params->op->status ==
+	if (op == NULL && ut_params->op->status ==
 			RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
 		printf("Device doesn't support this mixed combination. "
 				"Test Skipped.\n");
 		return -ENOTSUP;
 	}
+	ut_params->op = op;
 
 	TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");