From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DB0DA04B1 for ; Mon, 23 Nov 2020 18:13:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 66E03C8F4; Mon, 23 Nov 2020 18:13:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 1B32CC922 for ; Mon, 23 Nov 2020 18:13:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H/2eMjizxY0LvG+POQ+wNxC9FDFj8xgHV7Sx+arqqKM=; b=FKrttA9GkxlRDoG2BbqK5781Wu8NwYYZhYX55sYffRtr3zaEnvAS6t4pL5k+teb9YLw4Wl Bp8TxXtBGEfwLrBDe9a2vlcmUV3lTSH3ywszQLACjnsU+L3e9WZQaEqwSgP2tlnIJUFubl ZS1818VqwCo7xBWfhkq42gnfdoW1xqQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-542-MBhQCHUsMWOYuseWqg9Ttg-1; Mon, 23 Nov 2020 12:13:30 -0500 X-MC-Unique: MBhQCHUsMWOYuseWqg9Ttg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77C95879524; Mon, 23 Nov 2020 17:13:29 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8269060C04; Mon, 23 Nov 2020 17:13:26 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Lee Daly , dpdk stable Date: Mon, 23 Nov 2020 17:12:18 +0000 Message-Id: <20201123171222.79398-26-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'compress/isal: check allocation in queue setup' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Lee Daly --- 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,