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 3C23DA0545 for ; Mon, 20 Jun 2022 11:48:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36F6E427EB; Mon, 20 Jun 2022 11:48:15 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 28C9D427F9 for ; Mon, 20 Jun 2022 11:48:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718493; 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=fJ3P8ZEVWiE8hYuj6RT3EY8RnCc3VRa2nwRYYLXYPVk=; b=Eg/fCtdRAwd8LvOYw2Pt+T3mr7t0qfnO15pndHYxZsc6uO5LehJ1r04h7T1K+wulY6eoBR IV5ddmWXEWIbKlvKHSTQgHngoMWGetWOzLZtTZjlTMY/nIoXVvnnty4A7sJxj4iQXK6kp6 KIUXGJUa59aLQVvanCrU0q9F1o9sUUI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [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-380-C9t4F0abO_mN3DEm7s1g_Q-1; Mon, 20 Jun 2022 05:48:10 -0400 X-MC-Unique: C9t4F0abO_mN3DEm7s1g_Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20CF5803B22; Mon, 20 Jun 2022 09:48:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8C0A400F3FF; Mon, 20 Jun 2022 09:48:08 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Xiangjun Meng , Andrew Rybchenko , dpdk stable Subject: patch 'net/tap: fix device freeing' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:42 +0100 Message-Id: <20220620094752.1027299-9-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 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/23/22. 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/e731132bca9f559d6d941240bc383d2435fcccb4 Thanks. Kevin --- >From e731132bca9f559d6d941240bc383d2435fcccb4 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Jun 2022 14:50:57 +0800 Subject: [PATCH] net/tap: fix device freeing [ upstream commit f2aebfc4e941b315cebb71d6408dd5bbb0570a96 ] The error path was calling rte_eth_dev_release_port() function, which frees eth_dev->data->dev_private, and then tries to free pmd->intr_handle, which causes the use after free issue. The free can be moved to before the release function is called. Fixes: d61138d4f0e ("drivers: remove direct access to interrupt handle") Signed-off-by: Xiangjun Meng Signed-off-by: Yunjian Wang Reviewed-by: Andrew Rybchenko --- drivers/net/tap/rte_eth_tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 919968af44..e020a2417b 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2172,6 +2172,6 @@ error_exit: /* mac_addrs must not be freed alone because part of dev_private */ dev->data->mac_addrs = NULL; - rte_eth_dev_release_port(dev); rte_intr_instance_free(pmd->intr_handle); + rte_eth_dev_release_port(dev); error_exit_nodev: -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:27.986783609 +0100 +++ 0009-net-tap-fix-device-freeing.patch 2022-06-20 10:46:27.785146834 +0100 @@ -1 +1 @@ -From f2aebfc4e941b315cebb71d6408dd5bbb0570a96 Mon Sep 17 00:00:00 2001 +From e731132bca9f559d6d941240bc383d2435fcccb4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f2aebfc4e941b315cebb71d6408dd5bbb0570a96 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 5495818be6..9e1032fe72 100644 +index 919968af44..e020a2417b 100644 @@ -26 +27 @@ -@@ -2180,6 +2180,6 @@ error_exit: +@@ -2172,6 +2172,6 @@ error_exit: