Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2286010ybl; Thu, 19 Dec 2019 11:01:52 -0800 (PST) X-Google-Smtp-Source: APXvYqwlBWnSVQYEJNZmVAg9++WuQZiHVC+aWdCgcN2INxmLx8fBvc+3LTXO2z9rpNK7LqPE5f3D X-Received: by 2002:aca:48cf:: with SMTP id v198mr2907243oia.35.1576782112164; Thu, 19 Dec 2019 11:01:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576782112; cv=none; d=google.com; s=arc-20160816; b=Px48OPtFayHxgu0G57nwpaUdB+Iwu7gPWfmXiQx8Frd+AuQkK7oiRFTKpMd7LuVxBI oDykn5QSYhA/+n82MLBgLqfL2W1l4EqNsOJ1Be2kuU+pXib+fOgg1MvAy7OUAS7IT3Bl ozZVj/b9A4UDmErZs9m2AC0LNHKnidjFwQ2G3S2kn2hXQ8BX6SfV8ZrEjkUwtl67ZI9T j5O4hhRa/ll/DVfOPnvSjNYtT7UZ5bk70Dpgd8/CNtm4iRg4BQm1i4IoR6pKKafxwzv4 338WQNGXQWuofX6eOqM2L6vrsRxxC6y5NunZXGFRXHB/VsWChzzA+Zwj+udd1keXXF20 4LdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bUbSIncqv8LV85TU47h0RW5jG6gcfRZHuEMhDrhgYb0=; b=OmZjyAa62rLjRUrTZ/9cptCAQtWqFbJzvvPL1Z9x90fA6Fxz6AtZX4HD45pK4XpNI+ nU7ArD0awLJt92WC0vrtDiBBIL+ta6lRgJDLHr/PWP7YDfOSwQsipYc5zofU+NmKBphb CyTHtltRuSiJPvujA0sMfVe4UDNd823gwE997mFSj/Erp4i7z0DXZGOzvAHxut7d5R4X FL6yWHoT0Qu5RBvzdL6hY0rKmlW+8UP1jHRADKjWkl82RqjseH7gXvif5sV6k1MYYGTV g6ZLzKpg0jlSY6NcWY7aE/jbKu6EzwzrNflk+/1GL/pJIzq9PIDRUsWZTdG/imQeyT3L a6UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WqC5esDJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j9si1539240otn.294.2019.12.19.11.01.29; Thu, 19 Dec 2019 11:01:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WqC5esDJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729982AbfLSSwf (ORCPT + 99 others); Thu, 19 Dec 2019 13:52:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:47104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729482AbfLSSwa (ORCPT ); Thu, 19 Dec 2019 13:52:30 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1EAD9222C2; Thu, 19 Dec 2019 18:52:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781549; bh=Tl+cwKs1KEpr9E/rqXzA/XAl3ITKMtV/OSVEF0P9scs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WqC5esDJbrsLQbPIVsd6rKedIhFxZ/DMcI20nkRUWyOpkPCIn8zLIeba1aXCKyjpe 02/6v8Bilwww3l7X9adVvm/Dh0soJ7/AyTRWeOq1UM7ja4Syybwre2HDbRT+FFGvD5 q3l2z8Plhdjako7f1YB6kF37txr2PUJk74oCbf2o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+2add91c08eb181fea1bf@syzkaller.appspotmail.com, Nikolay Aleksandrov , "David S. Miller" Subject: [PATCH 4.19 03/47] net: bridge: deny dev_set_mac_address() when unregistering Date: Thu, 19 Dec 2019 19:34:17 +0100 Message-Id: <20191219182859.778509456@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182857.659088743@linuxfoundation.org> References: <20191219182857.659088743@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikolay Aleksandrov [ Upstream commit c4b4c421857dc7b1cf0dccbd738472360ff2cd70 ] We have an interesting memory leak in the bridge when it is being unregistered and is a slave to a master device which would change the mac of its slaves on unregister (e.g. bond, team). This is a very unusual setup but we do end up leaking 1 fdb entry because dev_set_mac_address() would cause the bridge to insert the new mac address into its table after all fdbs are flushed, i.e. after dellink() on the bridge has finished and we call NETDEV_UNREGISTER the bond/team would release it and will call dev_set_mac_address() to restore its original address and that in turn will add an fdb in the bridge. One fix is to check for the bridge dev's reg_state in its ndo_set_mac_address callback and return an error if the bridge is not in NETREG_REGISTERED. Easy steps to reproduce: 1. add bond in mode != A/B 2. add any slave to the bond 3. add bridge dev as a slave to the bond 4. destroy the bridge device Trace: unreferenced object 0xffff888035c4d080 (size 128): comm "ip", pid 4068, jiffies 4296209429 (age 1413.753s) hex dump (first 32 bytes): 41 1d c9 36 80 88 ff ff 00 00 00 00 00 00 00 00 A..6............ d2 19 c9 5e 3f d7 00 00 00 00 00 00 00 00 00 00 ...^?........... backtrace: [<00000000ddb525dc>] kmem_cache_alloc+0x155/0x26f [<00000000633ff1e0>] fdb_create+0x21/0x486 [bridge] [<0000000092b17e9c>] fdb_insert+0x91/0xdc [bridge] [<00000000f2a0f0ff>] br_fdb_change_mac_address+0xb3/0x175 [bridge] [<000000001de02dbd>] br_stp_change_bridge_id+0xf/0xff [bridge] [<00000000ac0e32b1>] br_set_mac_address+0x76/0x99 [bridge] [<000000006846a77f>] dev_set_mac_address+0x63/0x9b [<00000000d30738fc>] __bond_release_one+0x3f6/0x455 [bonding] [<00000000fc7ec01d>] bond_netdev_event+0x2f2/0x400 [bonding] [<00000000305d7795>] notifier_call_chain+0x38/0x56 [<0000000028885d4a>] call_netdevice_notifiers+0x1e/0x23 [<000000008279477b>] rollback_registered_many+0x353/0x6a4 [<0000000018ef753a>] unregister_netdevice_many+0x17/0x6f [<00000000ba854b7a>] rtnl_delete_link+0x3c/0x43 [<00000000adf8618d>] rtnl_dellink+0x1dc/0x20a [<000000009b6395fd>] rtnetlink_rcv_msg+0x23d/0x268 Fixes: 43598813386f ("bridge: add local MAC address to forwarding table (v2)") Reported-by: syzbot+2add91c08eb181fea1bf@syzkaller.appspotmail.com Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_device.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -246,6 +246,12 @@ static int br_set_mac_address(struct net if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; + /* dev_set_mac_addr() can be called by a master device on bridge's + * NETDEV_UNREGISTER, but since it's being destroyed do nothing + */ + if (dev->reg_state != NETREG_REGISTERED) + return -EBUSY; + spin_lock_bh(&br->lock); if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) { /* Mac address will be changed in br_stp_change_bridge_id(). */