Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2267183ybl; Thu, 19 Dec 2019 10:42:26 -0800 (PST) X-Google-Smtp-Source: APXvYqxpX1Be86UWoIbkexw2aQNHbqLCnx4WPlR5KAbAfmZtKDNOGyNfohJEJ0dwOObWNmWFBFn7 X-Received: by 2002:a9d:10b:: with SMTP id 11mr3197983otu.222.1576780946227; Thu, 19 Dec 2019 10:42:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780946; cv=none; d=google.com; s=arc-20160816; b=IQH3BL0rKiVJBsnEGvvrjqdW+MYYr+hl2liihL1Rz3BTROXZwgC5u2gGZqtGx0ZnZK LIEAZWD9LOtgWwkCidBVU18AS6NDqFH9NAezTmsDPiOCDjeTopwdCyJ6MTv/QeU+rkZn ugWJydcDNqRQfZM6KkuTLZ7mdEzHeoDgBoViMj3G++N6Qs0js3acgQRjT0GsIBquSrns t7g0Vbi0NhVem+ZK8tH2IpBjzALJUNSw6gnqqpXakjivmiTz9yFjGs1K1bja7BBwE+mh sQQmI/MauLzoH7nqfVE1MMbiVa9/+ArADW+hWO9a3aYNbIPHAWTfgIGXUz+uFp6PclbG d2vQ== 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=YD7czgodnKtq2yiZ0VXrw8QrFbBrDJCEqDaRgAtcu6M=; b=ZSFcXcHCY+uTTlLYD+UMouUJpWXfqKU6DYUxObpMgsub08egPV8C5Ovw9PtX5pcW/f 5OJvOHVLQX955gsX+M9thDLyku258tgbL8D9gWhZkoC/TzEqPfevsdy1YVLQsLZwKPcP ZA4abrd8JNcs3wlqzaR9Me5ZXLm9hdPS/Hj7epRYC3Fy/J3fVz4I/yIoTZv2Vu0Oe7La cSfgHrgd57dTqukApGZ9hBrSjQDUFiPydfggu9OxGdr/0A2iQ/dAqTFJg8j3AXU891wT X+c+VRGxB5rHP2LiLo3tujsFLCew3AGa9Y+umzuyRvPXHV8iJx4vtLPCxv2ID5CMsDSR qGDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uWuMhxyO; 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 o4si3543588oib.70.2019.12.19.10.42.15; Thu, 19 Dec 2019 10:42:26 -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=uWuMhxyO; 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 S1728455AbfLSSk4 (ORCPT + 99 others); Thu, 19 Dec 2019 13:40:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:59750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728446AbfLSSky (ORCPT ); Thu, 19 Dec 2019 13:40:54 -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 F3DDE222C2; Thu, 19 Dec 2019 18:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780853; bh=+xd6pYjnSecTjDFvofcUQa92EYOyYD0/l1uNlxbq71s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uWuMhxyO7rHcN3qIMaVF2KpiownWihQ0gzxi2dvYQxGuqFNx/Deb+EUTKYnkB0EP4 ANNJRZg58TH9FNjYibN9YhdNO+F1mHsclkA8324O3ulpO/xNPOCXtwK+tIPWo36feK AZiF3XVO4U/5neprOzTgSd3WDhViEn7nEtHHFync= 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.4 143/162] net: bridge: deny dev_set_mac_address() when unregistering Date: Thu, 19 Dec 2019 19:34:11 +0100 Message-Id: <20191219183216.477715430@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@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 @@ -199,6 +199,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(). */