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 3238D42CBC for ; Thu, 15 Jun 2023 03:34:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C66C42D30; Thu, 15 Jun 2023 03:34:13 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 0E7B042D37 for ; Thu, 15 Jun 2023 03:34:12 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-30fceb009faso178136f8f.0 for ; Wed, 14 Jun 2023 18:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792852; x=1689384852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nfp2mNnFBGl3CI7v40kL6WeSL7fwmP+SE/bBPxlsML4=; b=lR8GHlWpnGsBWKWpY2+G08u0xk9PtiFGv8+7W/X+V8kWfZL3DyI1dV9xSRbafnMgNB 3lqwBQMHzB8WgcicjwfiF519NlY6fF9EN5Qiqdh/+Pkw1cU/UWjQUTJzpIf9PH650FRz k/2vAkskoPJm7ZXMvchvFkEFtCydMQTHFG06jsgmFzjsd8mrBr0nGruREKHnVb49AGmK COkwk+7C7fER/+Mw5ajPN6KbjY5hpFnp5c/XPTLZw49cROPWJ0z45B5z7EABLnlLftvm hHCMcDCFsZqcZoXzzUflt7tgVMQhLEFNox+FXj80m3ylNJPfaXVjPlMylC4MiBFX9VqN 3O/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792852; x=1689384852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nfp2mNnFBGl3CI7v40kL6WeSL7fwmP+SE/bBPxlsML4=; b=BC8TUYnCpmDbarAj4wdFq1IieSIMABtRcfGGKLYcSZGcqL0sgU2VhbJmtzfbJkdZ/M LBM+FhypCxZrNWGuqhrqZiyX+3ig5p8FTzO49IbGGDCkz7hFCkBmDZA/8I2NeERQx9rB RHRslCusj0rWx6XZ9RQLaGvkZMNs2chHhOgMR2YKOTCmuxVa7D8X9pLM5t1ANGhvq08o GTKZpOX+t0FpqZtn0W4vhu9aHhpVNcddhGaUNWwGrt32IoMM3SlmOnZ/Z4CGA0piZYgu y/8ALw4BXgmwUCp9BiuqSGs020YBGBxHGfwtkZI/YETQrkdVIbdzga4/MrrQCeFIcu+F GZHA== X-Gm-Message-State: AC+VfDxQGLnPrSihasV53sUI1gIv8eR/Gf/rg+KXtQJ0vZmnCOVH/BsQ 2SiWUYDLfRxocyDjgNiHSXOqeXu0NuX8XPNK X-Google-Smtp-Source: ACHHUZ61Vq7UxW4ZZBI/Znoy3P1pSWDe3D3kQUJemyPILdIISXxxFt0ZjvrvRn6LF7UPsuTgoKztfw== X-Received: by 2002:a5d:4846:0:b0:30f:bde3:aa6 with SMTP id n6-20020a5d4846000000b0030fbde30aa6mr2531739wrs.15.1686792851674; Wed, 14 Jun 2023 18:34:11 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id e10-20020a056000194a00b0030497b3224bsm19595404wry.64.2023.06.14.18.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:11 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.9 Date: Thu, 15 Jun 2023 02:32:20 +0100 Message-Id: <20230615013258.1439718-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3d791ce89a00e5130179fae8fd34043cfc575bc3 Thanks. Luca Boccassi --- >From 3d791ce89a00e5130179fae8fd34043cfc575bc3 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 dd5b54b83f..a9797ff95b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1792,8 +1792,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.075650326 +0100 +++ 0025-net-txgbe-fix-use-after-free-on-remove.patch 2023-06-15 01:56:34.559541129 +0100 @@ -1 +1 @@ -From 0105788ebac6c796f30361912377550207084a17 Mon Sep 17 00:00:00 2001 +From 3d791ce89a00e5130179fae8fd34043cfc575bc3 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,12 +22,0 @@ -diff --git a/.mailmap b/.mailmap -index c5dd75633d..034fb27843 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1049,6 +1049,7 @@ Pawel Rutkowski - Pawel Wodkowski - Pei Chao - Pei Zhang -+Pengfei Sun - Peng He - Peng Huang - Peng Sun @@ -36 +24 @@ -index a502618bc5..a3d7461951 100644 +index dd5b54b83f..a9797ff95b 100644 @@ -39 +27 @@ -@@ -2032,8 +2032,10 @@ txgbe_dev_close(struct rte_eth_dev *dev) +@@ -1792,8 +1792,9 @@ txgbe_dev_close(struct rte_eth_dev *dev) @@ -46 +33,0 @@ -+ rte_eal_alarm_cancel(txgbe_dev_detect_sfp, dev);