From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51407 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751135AbcAUAoc (ORCPT ); Wed, 20 Jan 2016 19:44:32 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , "David S. Miller" , David Ahern Subject: [PATCH 4.3 01/55] Revert "vrf: fix double free and memory corruption on register_netdevice failure" Date: Wed, 20 Jan 2016 16:43:36 -0800 Message-Id: <20160120232227.500497451@linuxfoundation.org> In-Reply-To: <20160120232227.417513468@linuxfoundation.org> References: <20160120232227.417513468@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: stable-owner@vger.kernel.org List-ID: 4.3-stable review patch. If anyone has any objections, please let me know. ------------------ 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)