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 AADD1A0350 for ; Mon, 21 Feb 2022 16:40:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A08344013F; Mon, 21 Feb 2022 16:40:57 +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 C2478410F2 for ; Mon, 21 Feb 2022 16:40:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458055; 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=Obi1QndPfrZfdDWmSnJXWv0cDX3iYb/LnS9fEsH01jQ=; b=KZxIqPuBx5qIvpYgSVNmjv6FwzVgDTh0UDLfyiosoBb3k+zLxmDiRC51Y4+AKcNtD0hsWC EAQBDVrrbs1frHUhOMW1e5Oxs/S4OC9dpPfq3zu2uNS8ZvVchi5KLTgKV+ZH2ulrcuNNx5 9foHDin+lJO6lY0JsShAO3Dji+uwzMM= 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-225-SdH7bnPvM5-41qwXFKFqHQ-1; Mon, 21 Feb 2022 10:40:52 -0500 X-MC-Unique: SdH7bnPvM5-41qwXFKFqHQ-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 DCB911853028; Mon, 21 Feb 2022 15:40:50 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id D23087B9D9; Mon, 21 Feb 2022 15:40:49 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/dpaa2: fix null pointer dereference' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:16 +0000 Message-Id: <20220221153625.152324-127-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/9ac1343c4de9c2b4f093ab163b1a739d76dcaccf Thanks. Kevin --- >From 9ac1343c4de9c2b4f093ab163b1a739d76dcaccf Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 25 Jan 2022 22:23:48 +0800 Subject: [PATCH] net/dpaa2: fix null pointer dereference [ upstream commit 29e5519dab554407f9d375abb40fdb57f8d445db ] Check for memory allocation failure is added to avoid null pointer dereference. Fixes: 4690a6114ff6 ("net/dpaa2: enable error queues optionally") Signed-off-by: Weiguo Li Reviewed-by: Ferruh Yigit --- drivers/net/dpaa2/dpaa2_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 87a8a6e55e..b875139689 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -396,4 +396,6 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) priv->rx_err_vq = rte_zmalloc("dpni_rx_err", sizeof(struct dpaa2_queue), 0); + if (!priv->rx_err_vq) + goto fail; dpaa2_q = (struct dpaa2_queue *)priv->rx_err_vq; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.348633247 +0000 +++ 0127-net-dpaa2-fix-null-pointer-dereference.patch 2022-02-21 15:22:44.255704495 +0000 @@ -1 +1 @@ -From 29e5519dab554407f9d375abb40fdb57f8d445db Mon Sep 17 00:00:00 2001 +From 9ac1343c4de9c2b4f093ab163b1a739d76dcaccf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 29e5519dab554407f9d375abb40fdb57f8d445db ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 09105f049e..379daec5f4 100644 +index 87a8a6e55e..b875139689 100644 @@ -22 +23 @@ -@@ -400,4 +400,6 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) +@@ -396,4 +396,6 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)