test/crypto: fix null dereference for crypto op
PATCH 1/1 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
--- app/test/test_cryptodev.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
app/test/test_cryptodev.c +8 -6
@@ -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" );
Signature · 1 line
2.25.1
Quoted 43 lines
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_requestfunction, which may be NULL. Theop->statusvalue 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_requestfunction, so the originalop->statuscan 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: 363452Fixes 4868f6591c6f ("test/crypto: add cases for raw datapath API")Signed-off-by Ciara Power <[email protected]>--- app/test/test_cryptodev.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)app/test/test_cryptodev.c +1
-0@@ -6676,6 +6676,7 @@ test_mixed_auth_cipher(const structmixed_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 */ app/test/test_cryptodev.c +1
-2if (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);
app/test/test_cryptodev.c test_mixed_auth_cipher(const struct · line 6786
Quoted 10 lines
app/test/test_cryptodev.c +1
-1/* 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?
Quoted 38 lines
app/test/test_cryptodev.c +1
-0+ ut_params->op = op;app/test/test_cryptodev.c +1
-0TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" );@@ -6872,6 +6873,7 @@ test_mixed_auth_cipher_sgl(const structmixed_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 */ app/test/test_cryptodev.c +3
-3if (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
Quoted 61 lines
Quoted 43 lines
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_requestfunction, which may be NULL. Theop->statusvalue 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_requestfunction, so the originalop->statuscan 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: 363452Fixes 4868f6591c6f ("test/crypto: add cases for raw datapath API")Signed-off-by Ciara Power <[email protected]>--- app/test/test_cryptodev.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)app/test/test_cryptodev.c +1
-0@@ -6676,6 +6676,7 @@ test_mixed_auth_cipher(const structmixed_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 */ app/test/test_cryptodev.c +1
-2if (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);app/test/test_cryptodev.c test_mixed_auth_cipher(const struct · line 6786
Quoted 10 lines
app/test/test_cryptodev.c +1
-1/* 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)
Quoted 2 lines
In this way the coverity should not raise an issue for this. What say?
Please disregard my comment. The patch is good.
Applied to dpdk-next-crypto
Thanks.