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 4B04642D46 for ; Sun, 25 Jun 2023 08:39:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46A4140ED8; Sun, 25 Jun 2023 08:39:30 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2043.outbound.protection.outlook.com [40.107.223.43]) by mails.dpdk.org (Postfix) with ESMTP id E212840A7F for ; Sun, 25 Jun 2023 08:39:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrGJpdQTJGaxXgYZLXYkH4adQW1qf52+ez/bmiY3T/fjla3drqLauxmXrwlD3pMdY1naZh4EhsmbveLopZMkvkbNPzsSZ8gxtW231kVvRrOAevo1LAqyN7jGzJwXJMgpBNFWoI67orQA5SdWQd3f9+WBGpibUQEWxzMYKlq81RCseDmjivuM/CZ9Aahk+yXofDktcBhVK2HNjY/yOOo4KBWFVcrBEilTRqCNRQWjOP2tetUfyxsSf74lC3VyzdlMaOy3V1RprnG6nqR450gGmWNw71nkPXn8+XC/Yok0ICsoI9BpN4/dYeixKs258PsQ26GpXlS4ZLkdyWQjnJDceA== 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=4QFonbdr5R6/a648FTaionJtpnL73lrUm2yRabsLNy8=; b=RjcFYAxjuonqilD5QSHdHkJ1TDVIf3kYCa6kLVVeo3h7d7AGz8iLMRqAi8sVFV/N0sMGFM3OJNEKWgykcH0tHdU0VuyLBGyvvQN6RxgA8K2EEex/iA5TNwxeeViAsdx+T2wqqRzH96TD+tJ8IHrGf0XSmqazOq921KULlGSEeO0loNZ3ojXi0AzGGkid4xXi8VURjs2cTIFNAFV4u0t+6j0XV4Y82S70nyRk4OttCCZ/wE7Gzl+INm3UwBUMbYdmNLJAJ1GpLQYjTqH7BKE5ysQ3hggou+VFuiXBNvwaDXhTB1QXV2tlFc+p1KP6/Vtg0KdzJp/8JcgPBrW+b6idfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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=4QFonbdr5R6/a648FTaionJtpnL73lrUm2yRabsLNy8=; b=H9UOUj2n6+yG56bBjwDiykC21UMDMzrPa7KcZGB/87HTUv5eoKahG02MnGvrNLBsiK04bH4GPC4+zt1RqlbwLHxl5KOVbscklOclMZFGnxCRzyRcRoyPrGRF5zkK1gHjyy4I29oUmQ3+JLWd1SZJ7ftrBOxmxwyFBQufwVFGfSkd1kW3LQ/afnV4vv2X1+TeP06EMDaApVVBaWR1FqE1ynDlNJIYOtHUY/pNBZZT6s1MMLh3DOt1vWSkfB42PokWI2r32Yo6iFtuj433NZEFbPuzZmFoQDX6yL3y6ChOUGhYoXxZ+U5PbbZUfbSMap3tybY1xFbOiO053nAF82/1Pw== Received: from DM6PR17CA0034.namprd17.prod.outlook.com (2603:10b6:5:1b3::47) by PH8PR12MB6963.namprd12.prod.outlook.com (2603:10b6:510:1be::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:39:24 +0000 Received: from DM6NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b3:cafe::c) by DM6PR17CA0034.outlook.office365.com (2603:10b6:5:1b3::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:39:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT024.mail.protection.outlook.com (10.13.172.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:39:22 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:39:09 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:39:08 -0700 From: Xueming Li To: Yunjian Wang CC: Pengfei Sun , Jiawen Wu , dpdk stable Subject: patch 'net/txgbe: fix use-after-free on remove' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:14 +0800 Message-ID: <20230625063544.11183-37-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: DM6NAM11FT024:EE_|PH8PR12MB6963:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b6de5ba-4a06-4149-5c0e-08db7546e945 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3lVHilbrIFlF0tOnq9iKT/ae8hw2oju7Hk1NOUUNk7bIrnkkstHgh/JhJTPYPPFgOMNMdHoybVZAwkiYRx3QCG4aM0NbowMGhlzTqmY/hIeN67TVwChDBNKDwos86kXw8tkhZSsPrJjB38PYpw6aI0qKiXJhJO1ZCPBuPNa+pwv/osdp7WOlD0RcBAFPmJLb2Yv+TJd0seEXjRhwOpDggXtIYLuO1Lf2H5C5AeptQ2PtAMmDkJZwx/rZCbrMOS/vTm/B8GlVtyVcOb8dk0ewjA6cDy6dUITIWQ068+ruS/WdxTwAvK219STL5MO/jkhvQ1UUIhmdT7T+9oL8rPYR8oHdQvHKOpntRJrLCVY/7B8RZ2oX5UAKYnSLa/h7EDSMAluv/yM0rsggO0mtiM8qze+fs0BYZouixfEOkFhlxBPQCYxOAW62hUAuUHakNqeoux4yNyLuqoCm8PB9AOV/2t1cjLuee3OjKmk1hBVj0kmemV2WMPybnu3Z7soMZUxJczcwieGbR+1T2Q42n3gKPhBh+Oq6KUsy5ZFiyyFc2DsY96cc0Ptk1My2ybt4QD7iqbhbgPqDXqR4KqUoyDqzUpaHrEjJNnp8as7+XKkYHxW9reJkU/BXUNpAmfC9QMgNOrb5yJrbJRIRugxntuy5Ias9JxcsJNOVK71ygs5T+Nvro3NsZgWGBqWUSd5jtG0rc7ZK3QA1b4IeTj3KV50MmQufOi4BK2wubNyC6F/FDC9aZaqFciLSDkGTXAdMfo2XVWkB54u38my5ls/hBSAXQA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199021)(46966006)(36840700001)(40470700004)(966005)(7696005)(6666004)(478600001)(54906003)(53546011)(16526019)(6286002)(186003)(26005)(1076003)(2906002)(82310400005)(6916009)(4326008)(316002)(70586007)(70206006)(8936002)(8676002)(41300700001)(5660300002)(7636003)(356005)(36756003)(40460700003)(82740400003)(86362001)(55016003)(36860700001)(83380400001)(47076005)(2616005)(426003)(336012)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:39:22.3448 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b6de5ba-4a06-4149-5c0e-08db7546e945 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6963 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 06/27/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=32e0eaa22b4adb5b17ffae452a4731386314a7ca Thanks. Xueming Li --- >From 32e0eaa22b4adb5b17ffae452a4731386314a7ca Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 18 May 2023 15:11:24 +0800 Subject: [PATCH] net/txgbe: fix use-after-free on remove Cc: Xueming Li [ upstream commit 0105788ebac6c796f30361912377550207084a17 ] When cleaning up NIC's interrupts, it is possible to add some alarms at the same time. However, if these alarms are not canceled, it may cause use-after-free problems. Therefore, after cleaning up NIC's interrupts, these alarms should also be canceled. Fixes: d3bb4a04eac1 ("net/txgbe: add SFP hotplug identification") Fixes: e0d876ef6bbc ("net/txgbe: support device stop and close") Reported-by: Pengfei Sun Signed-off-by: Yunjian Wang Reviewed-by: Jiawen Wu --- .mailmap | 1 + drivers/net/txgbe/txgbe_ethdev.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index e9b5482002..8d8c19d582 100644 --- a/.mailmap +++ b/.mailmap @@ -1034,6 +1034,7 @@ Pawel Rutkowski Pawel Wodkowski Pei Chao Pei Zhang +Pengfei Sun Peng He Peng Huang Peng Sun diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 55777cb10a..e0df734946 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2019,8 +2019,9 @@ txgbe_dev_close(struct rte_eth_dev *dev) rte_delay_ms(100); } while (retries++ < (10 + TXGBE_LINK_UP_TIME)); - /* cancel the delay handler before remove dev */ + /* cancel all alarm handler before remove dev */ rte_eal_alarm_cancel(txgbe_dev_interrupt_delayed_handler, dev); + rte_eal_alarm_cancel(txgbe_dev_setup_link_alarm_handler, dev); /* uninitialize PF if max_vfs not zero */ txgbe_pf_host_uninit(dev); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.489402500 +0800 +++ 0036-net-txgbe-fix-use-after-free-on-remove.patch 2023-06-25 14:31:58.325773900 +0800 @@ -1 +1 @@ -From 0105788ebac6c796f30361912377550207084a17 Mon Sep 17 00:00:00 2001 +From 32e0eaa22b4adb5b17ffae452a4731386314a7ca Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0105788ebac6c796f30361912377550207084a17 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -20,2 +22,2 @@ - drivers/net/txgbe/txgbe_ethdev.c | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) + drivers/net/txgbe/txgbe_ethdev.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) @@ -24 +26 @@ -index c5dd75633d..034fb27843 100644 +index e9b5482002..8d8c19d582 100644 @@ -27 +29 @@ -@@ -1049,6 +1049,7 @@ Pawel Rutkowski +@@ -1034,6 +1034,7 @@ Pawel Rutkowski @@ -36 +38 @@ -index a502618bc5..a3d7461951 100644 +index 55777cb10a..e0df734946 100644 @@ -39 +41 @@ -@@ -2032,8 +2032,10 @@ txgbe_dev_close(struct rte_eth_dev *dev) +@@ -2019,8 +2019,9 @@ txgbe_dev_close(struct rte_eth_dev *dev) @@ -46 +47,0 @@ -+ rte_eal_alarm_cancel(txgbe_dev_detect_sfp, dev);