From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 75D85A0096 for ; Wed, 8 May 2019 12:16:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E8E32862; Wed, 8 May 2019 12:16:28 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9CCA144C3 for ; Wed, 8 May 2019 12:16:26 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1029E3082AF4; Wed, 8 May 2019 10:16:26 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92F531A267; Wed, 8 May 2019 10:16:24 +0000 (UTC) From: Kevin Traynor To: Aaron Conole Cc: Michael Santana , Tiwei Bie , dpdk stable Date: Wed, 8 May 2019 11:15:02 +0100 Message-Id: <20190508101534.8984-20-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 08 May 2019 10:16:26 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix dangling pointer on failure' has been queued to LTS release 18.11.2 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.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 05/13/19. 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/9960f97eba5b60118b7e2f7c17117fbf4a28730f Thanks. Kevin Traynor --- >From 9960f97eba5b60118b7e2f7c17117fbf4a28730f Mon Sep 17 00:00:00 2001 From: Aaron Conole Date: Mon, 15 Apr 2019 10:48:18 -0400 Subject: [PATCH] net/virtio: fix dangling pointer on failure [ upstream commit 7dee8c79483e370a346d68060b0b890b273e9a46 ] When eth_virtio_dev_init() is cleaning up, it does not correctly set the mac_addrs variable to NULL, which will lead to a double free. Found during unit-test fixes. Fixes: 43d18765c027 ("net/virtio: fix memory leak on failure") Reported-by: Michael Santana Signed-off-by: Aaron Conole Reviewed-by: Tiwei Bie --- drivers/net/virtio/virtio_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index a1e3752a8..f938b7cef 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1709,4 +1709,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) out: rte_free(eth_dev->data->mac_addrs); + eth_dev->data->mac_addrs = NULL; return ret; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.853650924 +0100 +++ 0020-net-virtio-fix-dangling-pointer-on-failure.patch 2019-05-08 11:05:05.798933410 +0100 @@ -1 +1 @@ -From 7dee8c79483e370a346d68060b0b890b273e9a46 Mon Sep 17 00:00:00 2001 +From 9960f97eba5b60118b7e2f7c17117fbf4a28730f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7dee8c79483e370a346d68060b0b890b273e9a46 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 2272bb2e5..d25c08f0a 100644 +index a1e3752a8..f938b7cef 100644 @@ -25 +26 @@ -@@ -1863,4 +1863,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) +@@ -1709,4 +1709,5 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)