From: Kevin Traynor <ktraynor@redhat.com> To: Yunjian Wang <wangyunjian@huawei.com> Cc: Lee Daly <lee.daly@intel.com>, dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'compress/isal: check allocation in queue setup' has been queued to LTS release 18.11.11 Date: Mon, 23 Nov 2020 17:12:18 +0000 Message-ID: <20201123171222.79398-26-ktraynor@redhat.com> (raw) In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f1af8302c34cd0eab358b95c12007cd4cc33eb2c Thanks. Kevin. --- From f1af8302c34cd0eab358b95c12007cd4cc33eb2c Mon Sep 17 00:00:00 2001 From: Yunjian Wang <wangyunjian@huawei.com> Date: Mon, 2 Nov 2020 19:36:24 +0800 Subject: [PATCH] compress/isal: check allocation in queue setup [ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ] 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") Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Acked-by: Lee Daly <lee.daly@intel.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 a395a660d6..5e93bccf8c 100644 --- a/drivers/compress/isal/isal_compress_pmd_ops.c +++ b/drivers/compress/isal/isal_compress_pmd_ops.c @@ -248,9 +248,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, 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 */ @@ -258,4 +265,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, 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; @@ -283,6 +294,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.608652855 +0000 +++ 0026-compress-isal-check-allocation-in-queue-setup.patch 2020-11-23 17:10:14.012061606 +0000 @@ -1 +1 @@ -From e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 Mon Sep 17 00:00:00 2001 +From f1af8302c34cd0eab358b95c12007cd4cc33eb2c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 31c4559915..7d03749da3 100644 +index a395a660d6..5e93bccf8c 100644 @@ -23 +24 @@ -@@ -250,9 +250,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, +@@ -248,9 +248,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, @@ -41 +42 @@ -@@ -260,4 +267,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, +@@ -258,4 +265,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, @@ -50 +51 @@ -@@ -285,6 +296,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, +@@ -283,6 +294,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
next prev parent reply other threads:[~2020-11-23 17:13 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor 2020-11-23 18:35 ` David Marchand 2020-11-24 9:38 ` Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor 2020-11-23 18:36 ` David Marchand 2020-11-23 17:12 ` Kevin Traynor [this message] 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
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=20201123171222.79398-26-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=lee.daly@intel.com \ --cc=stable@dpdk.org \ --cc=wangyunjian@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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git