Skip to content

Commit

Permalink
compress/isal: check allocation in queue setup
Browse files Browse the repository at this point in the history
[ upstream commit e816f5e ]

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

Fixes: dc49e6a ("compress/isal: add ISA-L compression functionality")
Fixes: 7bf4f06 ("compress/isal: add ISA-L decomp functionality")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Lee Daly <lee.daly@intel.com>
  • Loading branch information
wyjwang authored and kevintraynor committed Nov 23, 2020
1 parent 6326a29 commit f1af830
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions drivers/compress/isal/isal_compress_pmd_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,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;
Expand All @@ -282,8 +293,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;
}
Expand Down

0 comments on commit f1af830

Please sign in to comment.