From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41457 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933340AbbLQWn2 (ORCPT ); Thu, 17 Dec 2015 17:43:28 -0500 Subject: Patch "Revert "vrf: fix double free and memory corruption on register_netdevice failure"" has been added to the 4.3-stable tree To: ben@decadent.org.uk, davem@davemloft.net, dsa@cumulusnetworks.com, gregkh@linuxfoundation.org, nikolay@cumulusnetworks.com Cc: , From: Date: Thu, 17 Dec 2015 14:43:27 -0800 In-Reply-To: <20151215153149.GO28542@decadent.org.uk> Message-ID: <1450392207152113@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "vrf: fix double free and memory corruption on register_netdevice failure" to the 4.3-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-vrf-fix-double-free-and-memory-corruption-on-register_netdevice-failure.patch and it can be found in the queue-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ben@decadent.org.uk Thu Dec 17 14:12:57 2015 From: Ben Hutchings Date: Tue, 15 Dec 2015 15:31:49 +0000 Subject: Revert "vrf: fix double free and memory corruption on register_netdevice failure" To: Greg Kroah-Hartman Cc: David Ahern , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Nikolay Aleksandrov , "David S. Miller" Message-ID: <20151215153149.GO28542@decadent.org.uk> From: Ben Hutchings This reverts commit b3abad339f8e268bb261e5844ab68b18a7797c29, which was an attempt to backport commit 7f109f7cc37108cba7243bc832988525b0d85909 upstream. The backport introduced a deadlock and other bugs. Signed-off-by: Ben Hutchings Acked-by: David S. Miller Acked-by: David Ahern Signed-off-by: Greg Kroah-Hartman --- drivers/net/vrf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -581,6 +581,7 @@ static int vrf_newlink(struct net *src_n { struct net_vrf *vrf = netdev_priv(dev); struct net_vrf_dev *vrf_ptr; + int err; if (!data || !data[IFLA_VRF_TABLE]) return -EINVAL; @@ -589,16 +590,26 @@ static int vrf_newlink(struct net *src_n dev->priv_flags |= IFF_VRF_MASTER; + err = -ENOMEM; vrf_ptr = kmalloc(sizeof(*dev->vrf_ptr), GFP_KERNEL); if (!vrf_ptr) - return -ENOMEM; + goto out_fail; vrf_ptr->ifindex = dev->ifindex; vrf_ptr->tb_id = vrf->tb_id; + err = register_netdevice(dev); + if (err < 0) + goto out_fail; + rcu_assign_pointer(dev->vrf_ptr, vrf_ptr); - return register_netdev(dev); + return 0; + +out_fail: + kfree(vrf_ptr); + free_netdev(dev); + return err; } static size_t vrf_nl_getsize(const struct net_device *dev) Patches currently in stable-queue which might be from ben@decadent.org.uk are queue-4.3/tipc-fix-kfree_skb-of-uninitialised-pointer.patch queue-4.3/revert-vrf-fix-double-free-and-memory-corruption-on-register_netdevice-failure.patch queue-4.3/vrf-fix-double-free-and-memory-corruption-on-register_netdevice-failure.patch