From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC0FDA04B1 for ; Thu, 5 Nov 2020 13:40:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 57B82C7FA; Thu, 5 Nov 2020 13:40:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id C0216C7FA for ; Thu, 5 Nov 2020 13:40:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580042; 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=tYhWU1iPMfuOgcaQwTm9UrI0FEDq7LTfzhJYtbASLdw=; b=PUZvPlTN61tWBPhSdEKPbzUnS9bcCKnVd/G3fTlzpZ+1LhyDdImZs47p3Z9UKdJ2A/Pz02 qvOzgGkkPx4We0KdyPkiC645NaKYj559LBl4NFYDS+rzzwfqJEdfHRLKyb+kPUC71XPnqq T1byXJwEiMYTtyBGgRZgN9FIAelJxCU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-nUs8fl4-O5SzdNrMmC6XTQ-1; Thu, 05 Nov 2020 07:40:38 -0500 X-MC-Unique: nUs8fl4-O5SzdNrMmC6XTQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 985F1186DD33; Thu, 5 Nov 2020 12:40:37 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99C755C3E1; Thu, 5 Nov 2020 12:40:36 +0000 (UTC) From: Kevin Traynor To: Long Li Cc: Stephen Hemminger , dpdk stable Date: Thu, 5 Nov 2020 12:39:11 +0000 Message-Id: <20201105124015.306404-4-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Subject: [dpdk-stable] patch 'net/netvsc: fix stale value after free' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/510aa52a7861e0c6e6853efb40c2f42e7b85466f Thanks. Kevin. --- >From 510aa52a7861e0c6e6853efb40c2f42e7b85466f Mon Sep 17 00:00:00 2001 From: Long Li Date: Mon, 10 Aug 2020 19:33:13 -0700 Subject: [PATCH] net/netvsc: fix stale value after free [ upstream commit 0caf5621a4cdaadb40c7686d86bf58dd841057d3 ] chim_index could potentially be used in other hn_txdesc when re-allocated. Mark it as invalid to prevent stale value being used. Fixes: cc0251813277 ("net/netvsc: split send buffers from Tx descriptors") Signed-off-by: Long Li Acked-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 5d580f6f7f..cc8bb7ed95 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -388,6 +388,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id, } - if (txd->chim_index != NVS_CHIM_IDX_INVALID) + if (txd->chim_index != NVS_CHIM_IDX_INVALID) { hn_chim_free(hv, txd->chim_index); + txd->chim_index = NVS_CHIM_IDX_INVALID; + } rte_pktmbuf_free(txd->m); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.349028952 +0000 +++ 0004-net-netvsc-fix-stale-value-after-free.patch 2020-11-05 12:38:54.146895947 +0000 @@ -1 +1 @@ -From 0caf5621a4cdaadb40c7686d86bf58dd841057d3 Mon Sep 17 00:00:00 2001 +From 510aa52a7861e0c6e6853efb40c2f42e7b85466f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0caf5621a4cdaadb40c7686d86bf58dd841057d3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index c8c4ee10c8..a388ff2588 100644 +index 5d580f6f7f..cc8bb7ed95 100644 @@ -22 +23 @@ -@@ -420,6 +420,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -388,6 +388,8 @@ hn_nvs_send_completed(struct rte_eth_dev *dev, uint16_t queue_id,