diff mbox series

test/compress: fix coverity warnings

Message ID 20190723105349.23622-1-adamx.dybkowski@intel.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series test/compress: fix coverity warnings |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-Compile-Testing success Compile Testing PASS
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Dybkowski, AdamX July 23, 2019, 10:53 a.m. UTC 
  CID 340857: Null pointer dereferences (NULL_RETURNS)

CID 340856: (CONSTANT_EXPRESSION_RESULT)

Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")

Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
---
 app/test/test_compressdev.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Fiona Trahe July 25, 2019, 1:56 p.m. UTC | #1 
Hi Adam,

> -----Original Message-----
> From: Dybkowski, AdamX
> Sent: Tuesday, July 23, 2019 11:54 AM
> To: dev@dpdk.org; Trahe, Fiona <fiona.trahe@intel.com>; akhil.goyal@nxp.com
> Cc: Dybkowski, AdamX <adamx.dybkowski@intel.com>
> Subject: [PATCH] test/compress: fix coverity warnings
> 
> CID 340857: Null pointer dereferences (NULL_RETURNS)
> 
> CID 340856: (CONSTANT_EXPRESSION_RESULT)
> 
> Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")
> 
> Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
> ---
>  app/test/test_compressdev.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
> index 65889c242..992eac8e0 100644
> --- a/app/test/test_compressdev.c
> +++ b/app/test/test_compressdev.c
> @@ -755,6 +755,12 @@ test_deflate_comp_decomp(const struct interim_data_params *int_data,
>  	char *contig_buf = NULL;
>  	uint64_t compress_checksum[num_bufs];
> 
> +	if (capa == NULL) {
> +		RTE_LOG(ERR, USER1,
> +			"Compress device does not support DEFLATE\n");
> +		return -1;
[Fiona] shouldn't you return -ENOTSUP?
Dybkowski, AdamX July 25, 2019, 2:22 p.m. UTC | #2 
Hi Fiona.

> -----Original Message-----
> From: Trahe, Fiona
> Sent: Thursday, 25 July, 2019 15:56
> To: Dybkowski, AdamX <adamx.dybkowski@intel.com>; dev@dpdk.org;
> akhil.goyal@nxp.com
> Cc: Trahe, Fiona <fiona.trahe@intel.com>
> Subject: RE: [PATCH] test/compress: fix coverity warnings
> 
> Hi Adam,
> 
> > -----Original Message-----
> > From: Dybkowski, AdamX
> > Sent: Tuesday, July 23, 2019 11:54 AM
> > To: dev@dpdk.org; Trahe, Fiona <fiona.trahe@intel.com>;
> > akhil.goyal@nxp.com
> > Cc: Dybkowski, AdamX <adamx.dybkowski@intel.com>
> > Subject: [PATCH] test/compress: fix coverity warnings
> >
> > CID 340857: Null pointer dereferences (NULL_RETURNS)
> >
> > CID 340856: (CONSTANT_EXPRESSION_RESULT)
> >
> > Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")
> >
> > Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
> > ---
> >  app/test/test_compressdev.c | 10 ++++++++--
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
> > index 65889c242..992eac8e0 100644
> > --- a/app/test/test_compressdev.c
> > +++ b/app/test/test_compressdev.c
> > @@ -755,6 +755,12 @@ test_deflate_comp_decomp(const struct
> interim_data_params *int_data,
> >  	char *contig_buf = NULL;
> >  	uint64_t compress_checksum[num_bufs];
> >
> > +	if (capa == NULL) {
> > +		RTE_LOG(ERR, USER1,
> > +			"Compress device does not support DEFLATE\n");
> > +		return -1;
> [Fiona] shouldn't you return -ENOTSUP?
[Adam] All other errors end with returning -1 (see the ret_status variable which is initialized to -1).
That's why I handle the error case the same way. This is inside the test suite, not a PMD.
Fiona Trahe July 26, 2019, 8:37 a.m. UTC | #3 
Hi Adam,

> -----Original Message-----
> From: Dybkowski, AdamX
> Sent: Thursday, July 25, 2019 3:23 PM
> To: Trahe, Fiona <fiona.trahe@intel.com>; dev@dpdk.org; akhil.goyal@nxp.com
> Subject: RE: [PATCH] test/compress: fix coverity warnings
> 
> Hi Fiona.
> 
> > -----Original Message-----
> > From: Trahe, Fiona
> > Sent: Thursday, 25 July, 2019 15:56
> > To: Dybkowski, AdamX <adamx.dybkowski@intel.com>; dev@dpdk.org;
> > akhil.goyal@nxp.com
> > Cc: Trahe, Fiona <fiona.trahe@intel.com>
> > Subject: RE: [PATCH] test/compress: fix coverity warnings
> >
> > Hi Adam,
> >
> > > -----Original Message-----
> > > From: Dybkowski, AdamX
> > > Sent: Tuesday, July 23, 2019 11:54 AM
> > > To: dev@dpdk.org; Trahe, Fiona <fiona.trahe@intel.com>;
> > > akhil.goyal@nxp.com
> > > Cc: Dybkowski, AdamX <adamx.dybkowski@intel.com>
> > > Subject: [PATCH] test/compress: fix coverity warnings
> > >
> > > CID 340857: Null pointer dereferences (NULL_RETURNS)
> > >
> > > CID 340856: (CONSTANT_EXPRESSION_RESULT)
> > >
> > > Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")
> > >
> > > Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
> > > ---
> > >  app/test/test_compressdev.c | 10 ++++++++--
> > >  1 file changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
> > > index 65889c242..992eac8e0 100644
> > > --- a/app/test/test_compressdev.c
> > > +++ b/app/test/test_compressdev.c
> > > @@ -755,6 +755,12 @@ test_deflate_comp_decomp(const struct
> > interim_data_params *int_data,
> > >  	char *contig_buf = NULL;
> > >  	uint64_t compress_checksum[num_bufs];
> > >
> > > +	if (capa == NULL) {
> > > +		RTE_LOG(ERR, USER1,
> > > +			"Compress device does not support DEFLATE\n");
> > > +		return -1;
> > [Fiona] shouldn't you return -ENOTSUP?
> [Adam] All other errors end with returning -1 (see the ret_status variable which is initialized to -1).
> That's why I handle the error case the same way. This is inside the test suite, not a PMD.
[Fiona] ok, can see in the code that the capability is already checked at the higher level
for this case, so no need to return ENOTSUP here. -1 is ok
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Akhil Goyal July 26, 2019, 12:43 p.m. UTC | #4 
> > > >
> > > > CID 340857: Null pointer dereferences (NULL_RETURNS)
> > > >
> > > > CID 340856: (CONSTANT_EXPRESSION_RESULT)
> > > >
> > > > Fixes: 3be12ea52ad8 ("test/compress: improve debug trace setup")
> > > >
> > > > Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
> > > > ---
> > > >  app/test/test_compressdev.c | 10 ++++++++--
> > > >  1 file changed, 8 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
> > > > index 65889c242..992eac8e0 100644
> > > > --- a/app/test/test_compressdev.c
> > > > +++ b/app/test/test_compressdev.c
> > > > @@ -755,6 +755,12 @@ test_deflate_comp_decomp(const struct
> > > interim_data_params *int_data,
> > > >  	char *contig_buf = NULL;
> > > >  	uint64_t compress_checksum[num_bufs];
> > > >
> > > > +	if (capa == NULL) {
> > > > +		RTE_LOG(ERR, USER1,
> > > > +			"Compress device does not support DEFLATE\n");
> > > > +		return -1;
> > > [Fiona] shouldn't you return -ENOTSUP?
> > [Adam] All other errors end with returning -1 (see the ret_status variable which
> is initialized to -1).
> > That's why I handle the error case the same way. This is inside the test suite,
> not a PMD.
> [Fiona] ok, can see in the code that the capability is already checked at the
> higher level
> for this case, so no need to return ENOTSUP here. -1 is ok
> Acked-by: Fiona Trahe <fiona.trahe@intel.com>

Applied to dpdk-next-crypto

Thanks.
diff mbox series

Patch

diff --git a/app/test/test_compressdev.c b/app/test/test_compressdev.c
index 65889c242..992eac8e0 100644
--- a/app/test/test_compressdev.c
+++ b/app/test/test_compressdev.c
@@ -755,6 +755,12 @@  test_deflate_comp_decomp(const struct interim_data_params *int_data,
 	char *contig_buf = NULL;
 	uint64_t compress_checksum[num_bufs];
 
+	if (capa == NULL) {
+		RTE_LOG(ERR, USER1,
+			"Compress device does not support DEFLATE\n");
+		return -1;
+	}
+
 	/* Initialize all arrays to NULL */
 	memset(uncomp_bufs, 0, sizeof(struct rte_mbuf *) * num_bufs);
 	memset(comp_bufs, 0, sizeof(struct rte_mbuf *) * num_bufs);
@@ -975,7 +981,7 @@  test_deflate_comp_decomp(const struct interim_data_params *int_data,
 		enum rte_comp_huffman huffman_type =
 			compress_xform->deflate.huffman;
 		char engine[] = "zlib (directly, not PMD)";
-		if (zlib_dir != ZLIB_COMPRESS || zlib_dir != ZLIB_ALL)
+		if (zlib_dir != ZLIB_COMPRESS && zlib_dir != ZLIB_ALL)
 			strlcpy(engine, "PMD", sizeof(engine));
 
 		RTE_LOG(DEBUG, USER1, "Buffer %u compressed by %s from %u to"
@@ -1211,7 +1217,7 @@  test_deflate_comp_decomp(const struct interim_data_params *int_data,
 	for (i = 0; i < num_bufs; i++) {
 		priv_data = (struct priv_op_data *)(ops_processed[i] + 1);
 		char engine[] = "zlib, (directly, no PMD)";
-		if (zlib_dir != ZLIB_DECOMPRESS || zlib_dir != ZLIB_ALL)
+		if (zlib_dir != ZLIB_DECOMPRESS && zlib_dir != ZLIB_ALL)
 			strlcpy(engine, "pmd", sizeof(engine));
 		RTE_LOG(DEBUG, USER1,
 			"Buffer %u decompressed by %s from %u to %u bytes\n",