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 89118A046B for ; Tue, 23 Jul 2019 03:03:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 504D01BFE3; Tue, 23 Jul 2019 03:03:56 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id E8C581BFDC for ; Tue, 23 Jul 2019 03:03:54 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:50 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HgC026580; Tue, 23 Jul 2019 04:03:49 +0300 From: Yongseok Koh To: Aaron Conole Cc: Michael Santana , Tiwei Bie , dpdk stable Date: Mon, 22 Jul 2019 18:00:53 -0700 Message-Id: <20190723010115.6446-86-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix dangling pointer on failure' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Thanks. Yongseok --- >From 842ee58a1d02aeca33d0720fa06c06d22ab43c63 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 b242abb0fc..b3e55ff3bc 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1625,6 +1625,7 @@ 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.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:11.118331881 -0700 +++ 0086-net-virtio-fix-dangling-pointer-on-failure.patch 2019-07-22 17:55:06.407478000 -0700 @@ -1,15 +1,16 @@ -From 7dee8c79483e370a346d68060b0b890b273e9a46 Mon Sep 17 00:00:00 2001 +From 842ee58a1d02aeca33d0720fa06c06d22ab43c63 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") -Cc: stable@dpdk.org Reported-by: Michael Santana Signed-off-by: Aaron Conole @@ -19,10 +20,10 @@ 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c -index 2272bb2e56..d25c08f0a2 100644 +index b242abb0fc..b3e55ff3bc 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c -@@ -1862,6 +1862,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) +@@ -1625,6 +1625,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) out: rte_free(eth_dev->data->mac_addrs);