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 0818042ECF for ; Thu, 20 Jul 2023 17:24:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04ABF42D5F; Thu, 20 Jul 2023 17:24:36 +0200 (CEST) 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 147F040685 for ; Thu, 20 Jul 2023 17:24:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866673; 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=Oh1kgpRaHN1jItLd86GWrEfiKJT7sL2jo/JU+zEBXKw=; b=PDy+uFP87qq47sTKiLm+zZucBlB7Vir8pxBAHNJpt9+XOo/PcpxYGmMIw47a3TmlXXgf54 5qiWerbyCM1pvbCfjlXfumJz4M3QcBrGmAWKf7iKL1QUDpuz4EXDP2Hx13z5UUdirh5Ccu EJCXFFib/I69EM5Y3+7W5/neRjuYYNM= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-iiEqXSdsMB-FplK-lSyxdg-1; Thu, 20 Jul 2023 11:23:56 -0400 X-MC-Unique: iiEqXSdsMB-FplK-lSyxdg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DDBD3C1659D; Thu, 20 Jul 2023 15:23:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E60564A9004; Thu, 20 Jul 2023 15:23:04 +0000 (UTC) From: Kevin Traynor To: Kaiyu Zhang Cc: Chengwen Feng , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: fix potential leak in PCI probing helper' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:15 +0100 Message-ID: <20230720151942.262154-124-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/9eda05baa7292420aa0c30d04c57ec5ada94c5e3 Thanks. Kevin --- >From 9eda05baa7292420aa0c30d04c57ec5ada94c5e3 Mon Sep 17 00:00:00 2001 From: Kaiyu Zhang Date: Tue, 11 Jul 2023 01:18:09 +0000 Subject: [PATCH] ethdev: fix potential leak in PCI probing helper [ upstream commit 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 ] Sanity check is performed after a rte_eth_dev object is allocated. The object is not freed if the check fails, though in the current reality this never happens, but it's better programming paradigm to move the quick check up front to the start of rte_eth_dev_pci_generic_probe(). Fixes: dcd5c8112bc3 ("ethdev: add PCI driver helpers") Signed-off-by: Kaiyu Zhang Reviewed-by: Chengwen Feng Reviewed-by: Ferruh Yigit --- .mailmap | 1 + lib/ethdev/ethdev_pci.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 288cc4913c..12f6084945 100644 --- a/.mailmap +++ b/.mailmap @@ -680,4 +680,5 @@ Kai Ji Kaijun Zeng Kaiwen Deng +Kaiyu Zhang Kalesh AP Kamalakannan R diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h index 0549842709..7ab819c393 100644 --- a/lib/ethdev/ethdev_pci.h +++ b/lib/ethdev/ethdev_pci.h @@ -127,9 +127,11 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev, int ret; + if (*dev_init == NULL) + return -EINVAL; + eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size); if (!eth_dev) return -ENOMEM; - RTE_FUNC_PTR_OR_ERR_RET(*dev_init, -EINVAL); ret = dev_init(eth_dev); if (ret) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:09.941947656 +0100 +++ 0124-ethdev-fix-potential-leak-in-PCI-probing-helper.patch 2023-07-20 16:17:55.133752436 +0100 @@ -1 +1 @@ -From 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 Mon Sep 17 00:00:00 2001 +From 9eda05baa7292420aa0c30d04c57ec5ada94c5e3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -21,2 +22,2 @@ - lib/ethdev/ethdev_pci.h | 9 +++++---- - 2 files changed, 6 insertions(+), 4 deletions(-) + lib/ethdev/ethdev_pci.h | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) @@ -25 +26 @@ -index d200f36339..6c28ea798d 100644 +index 288cc4913c..12f6084945 100644 @@ -28,2 +29,2 @@ -@@ -699,4 +699,5 @@ Kaijun Zeng - Kaisen You +@@ -680,4 +680,5 @@ Kai Ji + Kaijun Zeng @@ -35 +36 @@ -index 94b8fba5d7..320e3e0093 100644 +index 0549842709..7ab819c393 100644 @@ -38 +39 @@ -@@ -127,10 +127,11 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev, +@@ -127,9 +127,11 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev, @@ -41,10 +42,2 @@ -- eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size); -- if (!eth_dev) -- return -ENOMEM; -- - if (*dev_init == NULL) - return -EINVAL; -+ -+ eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size); -+ if (!eth_dev) -+ return -ENOMEM; ++ if (*dev_init == NULL) ++ return -EINVAL; @@ -51,0 +45,5 @@ + eth_dev = rte_eth_dev_pci_allocate(pci_dev, private_data_size); + if (!eth_dev) + return -ENOMEM; + +- RTE_FUNC_PTR_OR_ERR_RET(*dev_init, -EINVAL);