From: wangyunjian <wangyunjian@huawei.com>
To: <dev@dpdk.org>
Cc: <lee.daly@intel.com>, <jerry.lilijun@huawei.com>,
<xudingke@huawei.com>, Yunjian Wang <wangyunjian@huawei.com>,
<stable@dpdk.org>
Subject: [dpdk-stable] [dpdk-dev] [PATCH] compress/isal: check allocation in qp setup
Date: Mon, 2 Nov 2020 19:36:24 +0800 [thread overview]
Message-ID: <4593dfcc7f70361a80cc1ea3b129f29074588e3d.1604317264.git.wangyunjian@huawei.com> (raw)
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(-)
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;
}
--
2.23.0
next reply other threads:[~2020-11-02 11:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 11:36 wangyunjian [this message]
2020-11-12 21:15 ` Akhil Goyal
2020-11-19 10:50 ` Daly, Lee
2020-11-22 11:14 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4593dfcc7f70361a80cc1ea3b129f29074588e3d.1604317264.git.wangyunjian@huawei.com \
--to=wangyunjian@huawei.com \
--cc=dev@dpdk.org \
--cc=jerry.lilijun@huawei.com \
--cc=lee.daly@intel.com \
--cc=stable@dpdk.org \
--cc=xudingke@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).