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 2149F4301F for ; Thu, 10 Aug 2023 02:01:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A9A840DD8; Thu, 10 Aug 2023 02:01:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2088.outbound.protection.outlook.com [40.107.93.88]) by mails.dpdk.org (Postfix) with ESMTP id B34DC406B6 for ; Thu, 10 Aug 2023 02:01:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hZONxEfM3d1evLFHY2tybEo0wTRtx2PXBMqZgB88FW5s7ZD4qizTOla991cBzgzkV2hKYNWvFEYbae1hMmAurkHgLJGJhsU6wzJ4pm3/RZTBCZux7i4yvQEVHe/hbTmLQz/eE0Pps0ea/a0HfWTg3VHCL94aYFjLyMP3xW96AVbpLrS0PScxbWbxTwKqJq2eY2j+UqtdaMN7VJKQwbQ8VRE7z6hxtz0T0sxcny4i0BzG1cuMTB47il+2Y7I4BmxK8aOYRPd1d8x0GzfQZIhRk/eUWaTkpgTYB7ZMiQWQhAjnAIoEcbezEvezhAKunyNc2e9iSivEYu1s4EoJVdxj6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tM/rtkDfShs1pmy1nEGGj1sizclKBdLMFCNq0Q6sc78=; b=aFfOcjgHagbvs3hQkRv+gzyghRkP/5KXaA3/2tXNMp8M+z52DG8530qDTohAi6jBgJXf5r6pfGFmTL5tghYlBgNPyTZN+mP45z9bMcHjPtdA1ZcWehKaLg377uxkPOynTFl9BxM6/mGSv1G7E1fub1v3CZL/ahdWYU4fj+RDHVvJYhe655Nuyz/VfiJ5Wq7Q/2oQ+TQffEaH1xuT9GuBvH5c30ME3CCfnzSOO9z0g94WxAYLXdwdBYidsn9mV/g6rd+KCrHWN+kZ/axq1oWJIeGCxpZMHtzVXFiXH2kSKaFzgd9lNWVA7V/cOypwKOh0pGlFHQE4Hysdq/4L6hjMZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=gmail.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tM/rtkDfShs1pmy1nEGGj1sizclKBdLMFCNq0Q6sc78=; b=urWPK6WTxPVKNcShUCMGR6Ca1cRm9iDsxGr52BgDWMomTMak+wDp8z2z0dhpbTPC/RJJG8ODMinwtCWRwy2jnj+TDBMxdFMJ82UcTav9HjU52NTSg8RsDsdqdlKEFamkjwJ62JhOx8MQcZya3gKvodJOgTSJAS9Id4m7BLplaBwRgKpDI1aI1Zs59yv5uVhkpehfqH9uzhyrGMyFhmPFBwbFJ2Ae+mdsUi4C8xPeo6tpkGWxP1HlihlbUo29G4NSzDmy/8BeQcRQ9DkpAEM9sizQlqW6acZbvE3s2Aw9nBbNeZNqelUX6b4yqDRvgMHayq4RnlXS0zHhpOY/aT9Baw== Received: from CY5PR22CA0005.namprd22.prod.outlook.com (2603:10b6:930:16::28) by BL3PR12MB6548.namprd12.prod.outlook.com (2603:10b6:208:38f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Thu, 10 Aug 2023 00:01:48 +0000 Received: from CY4PEPF0000E9CE.namprd03.prod.outlook.com (2603:10b6:930:16:cafe::84) by CY5PR22CA0005.outlook.office365.com (2603:10b6:930:16::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:01:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9CE.mail.protection.outlook.com (10.167.241.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:01:47 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:01:35 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 17:01:33 -0700 From: Xueming Li 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 22.11.3 Date: Thu, 10 Aug 2023 07:58:51 +0800 Message-ID: <20230809235947.1187-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9CE:EE_|BL3PR12MB6548:EE_ X-MS-Office365-Filtering-Correlation-Id: e6a80621-4eda-4450-b969-08db9934fd82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BIt1wx4A9vkoAIzu3Lm0PmMK8tQdXk3mQGrpem33lcAWzj0dup5UI4dbOPGKf8jztr5c6Tvpsu3rGT/n7WockbpaSaCdijWn82DEm+i96JXIEqoeN8gU05US8OSMKEx58fCXUB4AS14lKrQO38wdra8pWtqla3w+8vBWtV8WNCEWlQU5AvaRFaxk+JmJKXOJ8KY6k7f6wZayq9SNjxXzEaylG1jjD04aSksW4FtWR7UbE/1RSGSegU7rxlUZBYCaqxIBBEuyLuGm38HWsLc1qLRvcwujZJIizlZvVA9n3s4Mj3J6o/q5by550JQcCJNGsmVaXdgz1eCHLoY1Yk9q5bVwph/2s9i3tEsLK3t440jAdP8tjnCHZQT85Rkf6WJ0uPmYTOFcB516Lk18I3n4G54RX0KEbDiIq4Ovn24BNzk53Di9redQvoAL7yJy6t7+mSFk8tgHAry7ocVmvu2putf2H+CfRSntvI6Rq1RcXGIGHRbfHUzFA1ZVbNA3O2w8On5FfALcRN4kZ5i6GqE9P0loHHvTBlTRbGuhGC0kAnZLW6xqKAR0+NGjOv2eKxxuWTT/bxNWJ7YU7oupOb668HaSOjeOa46r7Q7X/WmT2l4vAIzrLSn63HVKUoVk0SaylOVP48W535jWUXxu/Si4SFeecCHuZyD4CBXTIkUc7Vnt/tQe2BKOlXJ5Hnk/ORUCuNxVEDYv+76fj1NOXcGJbIehxLvU9dZBl3kZmxNixIvT3eqtQU8hVx4WDngyA4AfbY+QU7ePFAtYIDF8nQQ7dQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(376002)(136003)(396003)(39860400002)(451199021)(82310400008)(1800799006)(186006)(36840700001)(46966006)(40470700004)(478600001)(54906003)(40460700003)(47076005)(36860700001)(83380400001)(26005)(336012)(426003)(2616005)(53546011)(16526019)(6286002)(356005)(86362001)(7636003)(82740400003)(55016003)(966005)(40480700001)(1076003)(7696005)(36756003)(6916009)(6666004)(5660300002)(316002)(70206006)(4326008)(8676002)(8936002)(70586007)(41300700001)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:01:47.2046 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6a80621-4eda-4450-b969-08db9934fd82 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9CE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6548 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=5aa903d5ef85d3eb38157c1b0837fce8e22c8e71 Thanks. Xueming Li --- >From 5aa903d5ef85d3eb38157c1b0837fce8e22c8e71 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 Cc: Xueming Li [ 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 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 6b38c488c2..a20c942643 100644 --- a/.mailmap +++ b/.mailmap @@ -678,6 +678,7 @@ Juraj Linkeš Kai Ji Kaijun Zeng Kaiwen Deng +Kaiyu Zhang Kalesh AP Kamalakannan R Kamalakshitha Aligeri diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h index 94b8fba5d7..320e3e0093 100644 --- a/lib/ethdev/ethdev_pci.h +++ b/lib/ethdev/ethdev_pci.h @@ -126,12 +126,13 @@ rte_eth_dev_pci_generic_probe(struct rte_pci_device *pci_dev, struct rte_eth_dev *eth_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; - if (*dev_init == NULL) - return -EINVAL; ret = dev_init(eth_dev); if (ret) rte_eth_dev_release_port(eth_dev); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.002615400 +0800 +++ 0072-ethdev-fix-potential-leak-in-PCI-probing-helper.patch 2023-08-09 21:51:18.214352000 +0800 @@ -1 +1 @@ -From 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 Mon Sep 17 00:00:00 2001 +From 5aa903d5ef85d3eb38157c1b0837fce8e22c8e71 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1f00a6a037040a7c6ba883e2c312894c6ebc4c32 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index d200f36339..6c28ea798d 100644 +index 6b38c488c2..a20c942643 100644 @@ -28 +30,2 @@ -@@ -698,6 +698,7 @@ Kai Ji +@@ -678,6 +678,7 @@ Juraj Linkeš + Kai Ji @@ -30 +32,0 @@ - Kaisen You