From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7B8EA0350 for ; Mon, 21 Feb 2022 16:43:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A25F94013F; Mon, 21 Feb 2022 16:43:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C86404114E for ; Mon, 21 Feb 2022 16:43:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458206; 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=MayLV0cRGsJoOF3D6/Jxa3p4UNH8e+T0Hb630IvUEgI=; b=aNQE46EOt/HZZx4JEaOIiVEP7pV5GTs7WRj8u2Zm63CPY5hnbZCiXJVcQnIqiXQitLbR++ hcng6wH4fm/1Fvso6bLvvBFtvZumk98nFyHIMPF3XG4xMEQnxUhHJYFfPWc1RX1g+KpFV5 kwjTxiWwY0vR8iDXRcvfMEibpsFmlD0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475-iPEmScKBMu6RAwZxvfQ7Kg-1; Mon, 21 Feb 2022 10:43:23 -0500 X-MC-Unique: iPEmScKBMu6RAwZxvfQ7Kg-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 E7E86814243; Mon, 21 Feb 2022 15:43:21 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC7F67E131; Mon, 21 Feb 2022 15:43:20 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Akhil Goyal , dpdk stable Subject: patch 'compress/octeontx: fix null pointer dereference' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:36:19 +0000 Message-Id: <20220221153625.152324-190-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-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" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2630bff5a411a24e143255b58c570aae7f5370eb Thanks. Kevin --- >From 2630bff5a411a24e143255b58c570aae7f5370eb Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 25 Jan 2022 22:33:15 +0800 Subject: [PATCH] compress/octeontx: fix null pointer dereference [ upstream commit b072930fb10a0471d69db5de341ea87a0d1561cc ] Check for memory allocation failure is added to avoid null pointer dereference. Fixes: c378f084d6e3 ("compress/octeontx: add device setup ops") Signed-off-by: Weiguo Li Acked-by: Akhil Goyal --- drivers/compress/octeontx/otx_zip_pmd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c index dd62285b86..1b6178f661 100644 --- a/drivers/compress/octeontx/otx_zip_pmd.c +++ b/drivers/compress/octeontx/otx_zip_pmd.c @@ -393,4 +393,6 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, name = rte_malloc(NULL, RTE_COMPRESSDEV_NAME_MAX_LEN, 0); + if (name == NULL) + return (-ENOMEM); snprintf(name, RTE_COMPRESSDEV_NAME_MAX_LEN, "zip_pmd_%u_qp_%u", @@ -400,6 +402,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, qp = rte_zmalloc_socket(name, sizeof(*qp), RTE_CACHE_LINE_SIZE, socket_id); - if (qp == NULL) + if (qp == NULL) { + rte_free(name); return (-ENOMEM); + } qp->name = name; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.647994232 +0000 +++ 0190-compress-octeontx-fix-null-pointer-dereference.patch 2022-02-21 15:22:44.375704766 +0000 @@ -1 +1 @@ -From b072930fb10a0471d69db5de341ea87a0d1561cc Mon Sep 17 00:00:00 2001 +From 2630bff5a411a24e143255b58c570aae7f5370eb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b072930fb10a0471d69db5de341ea87a0d1561cc ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 26cdce60a8..f9b8f7a1ec 100644 +index dd62285b86..1b6178f661 100644 @@ -22 +23 @@ -@@ -392,4 +392,6 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, +@@ -393,4 +393,6 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, @@ -29 +30 @@ -@@ -399,6 +401,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, +@@ -400,6 +402,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,