diff mbox series

compress/isal: check allocation in qp setup

Message ID 4593dfcc7f70361a80cc1ea3b129f29074588e3d.1604317264.git.wangyunjian@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series compress/isal: check allocation in qp setup |

Checks

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

Commit Message

Yunjian Wang Nov. 2, 2020, 11:36 a.m. UTC 
From: Yunjian Wang <wangyunjian@huawei.com>

The function rte_zmalloc() could return NULL, the return value
need to be checked.

Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")
Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/compress/isal/isal_compress_pmd_ops.c | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

Comments

Akhil Goyal Nov. 12, 2020, 9:15 p.m. UTC | #1 
> Subject: [dpdk-dev] [PATCH] compress/isal: check allocation in qp setup
> 
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The function rte_zmalloc() could return NULL, the return value
> need to be checked.
> 
> Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")
> Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
Acks please !!
Daly, Lee Nov. 19, 2020, 10:50 a.m. UTC | #2 
> From: wangyunjian <wangyunjian@huawei.com>
> Sent: Monday, November 2, 2020 11:36 AM
> To: dev@dpdk.org
> Cc: Daly, Lee <lee.daly@intel.com>; jerry.lilijun@huawei.com;
> xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] compress/isal: check allocation in qp setup
> 
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The function rte_zmalloc() could return NULL, the return value need to be
> checked.
> 
> Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")
> Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  drivers/compress/isal/isal_compress_pmd_ops.c | 20 ++++++++++++++++-
> --
Thanks for patch.
Acked-by: Lee Daly <lee.daly@intel.com>
Thomas Monjalon Nov. 22, 2020, 11:14 a.m. UTC | #3 
> > The function rte_zmalloc() could return NULL, the return value need to be
> > checked.
> > 
> > Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")
> > Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >  drivers/compress/isal/isal_compress_pmd_ops.c | 20 ++++++++++++++++-
> > --
> Thanks for patch.
> Acked-by: Lee Daly <lee.daly@intel.com>

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index 31c4559915..7d03749da3 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -249,16 +249,27 @@  isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 	qp->stream = rte_zmalloc_socket("Isa-l compression stream ",
 			sizeof(struct isal_zstream),  RTE_CACHE_LINE_SIZE,
 			socket_id);
-
+	if (qp->stream == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate compression stream memory");
+		goto qp_setup_cleanup;
+	}
 	/* Initialize memory for compression level buffer */
 	qp->stream->level_buf = rte_zmalloc_socket("Isa-l compression lev_buf",
 			ISAL_DEF_LVL3_DEFAULT, RTE_CACHE_LINE_SIZE,
 			socket_id);
+	if (qp->stream->level_buf == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate compression level_buf memory");
+		goto qp_setup_cleanup;
+	}
 
 	/* Initialize memory for decompression state structure */
 	qp->state = rte_zmalloc_socket("Isa-l decompression state",
 			sizeof(struct inflate_state), RTE_CACHE_LINE_SIZE,
 			socket_id);
+	if (qp->state == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate decompression state memory");
+		goto qp_setup_cleanup;
+	}
 
 	qp->id = qp_id;
 	dev->data->queue_pairs[qp_id] = qp;
@@ -284,8 +295,11 @@  isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 	return 0;
 
 qp_setup_cleanup:
-	if (qp)
-		rte_free(qp);
+	if (qp->stream)
+		rte_free(qp->stream->level_buf);
+	rte_free(qp->stream);
+	rte_free(qp->state);
+	rte_free(qp);
 
 	return -1;
 }