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 383EA42ECF for ; Thu, 20 Jul 2023 17:27:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 347C240685; Thu, 20 Jul 2023 17:27:46 +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 532DF400D6 for ; Thu, 20 Jul 2023 17:27:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866863; 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=bDdQzgW7Z4TzxHZeJUUITxHylaVIKjpn1CYFF2CeCFY=; b=B3D5PLowzJtVRHRlhHVU+qsMp7kOLz4nHzjxIb5mJ5JGv6O4U9NmWpDRr8qrEIQsxvjrLT 98Bec5zb6ek/+1O8Kze0cGRPASq3cqyGpwmgbujV+wvsQeO7Ok2p83ZupWZJub2kSkP2gq rGt81vWTlNL2tdB2aq6KzuP4ClpR6VA= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-2stkTBXPMy6tYdtexwuwtQ-1; Thu, 20 Jul 2023 11:20:39 -0400 X-MC-Unique: 2stkTBXPMy6tYdtexwuwtQ-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 6821F835054; Thu, 20 Jul 2023 15:20:38 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id D52C5492C13; Thu, 20 Jul 2023 15:20:36 +0000 (UTC) From: Kevin Traynor 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 21.11.5 Date: Thu, 20 Jul 2023 16:17:39 +0100 Message-ID: <20230720151942.262154-28-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/80e17cb702e2cf0cd808b31606c089762b4f03c0 Thanks. Kevin --- >From 80e17cb702e2cf0cd808b31606c089762b4f03c0 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 [ 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 --- drivers/net/txgbe/txgbe_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index af2bf00ebd..acc29071f0 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2010,6 +2010,7 @@ txgbe_dev_close(struct rte_eth_dev *dev) } 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 */ -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:58.402975735 +0100 +++ 0028-net-txgbe-fix-use-after-free-on-remove.patch 2023-07-20 16:17:54.512749899 +0100 @@ -1 +1 @@ -From 0105788ebac6c796f30361912377550207084a17 Mon Sep 17 00:00:00 2001 +From 80e17cb702e2cf0cd808b31606c089762b4f03c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0105788ebac6c796f30361912377550207084a17 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19,3 +20,2 @@ - .mailmap | 1 + - drivers/net/txgbe/txgbe_ethdev.c | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) + drivers/net/txgbe/txgbe_ethdev.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) @@ -23,10 +22,0 @@ -diff --git a/.mailmap b/.mailmap -index c5dd75633d..034fb27843 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1050,4 +1050,5 @@ Pawel Wodkowski - Pei Zhang -+Pengfei Sun - Peng He - Peng Huang @@ -34 +24 @@ -index a502618bc5..a3d7461951 100644 +index af2bf00ebd..acc29071f0 100644 @@ -37 +27 @@ -@@ -2033,6 +2033,8 @@ txgbe_dev_close(struct rte_eth_dev *dev) +@@ -2010,6 +2010,7 @@ txgbe_dev_close(struct rte_eth_dev *dev) @@ -43 +32,0 @@ -+ rte_eal_alarm_cancel(txgbe_dev_detect_sfp, dev);