From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16794C0650F for ; Thu, 8 Aug 2019 19:06:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0EB3214C6 for ; Thu, 8 Aug 2019 19:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565291188; bh=5wrB4OWkVaPLs28wOrveJdFAHDPbke7ee8m9rx6Tgdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lD3tBjnMqOfHTiy7suenGwndMc38j6YcWn/4S1vNFxYxRaB5ohnrHWvIHpQPItQUL RZ9e/x+t7v3YmArfZNAYyaHOhwlSBPg5vioH3jxGpOM7/xm0shwJzM+TXc1UG3eV1v fSN0ieuqb2+ZzmIoPknA1SD/YpB6XGY9vHdsVRP4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404432AbfHHTG2 (ORCPT ); Thu, 8 Aug 2019 15:06:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:39804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404374AbfHHTGW (ORCPT ); Thu, 8 Aug 2019 15:06:22 -0400 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 9DA732184E; Thu, 8 Aug 2019 19:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565291182; bh=5wrB4OWkVaPLs28wOrveJdFAHDPbke7ee8m9rx6Tgdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OVUANY3rxp+69yI51f5dOYJI6RzZ28OXSfnB4Hg+gq2gVatqUKGWO4nQmyOqt5MnL U6xbHNGVFASoeKhdou+5YiIAseDxdzQSCvdnShuuq3828urPBttfSNqbymCYdMmueD nB/tpLwGzlcXQrAsROxLexWhwpCsaG4H/3/ty0YM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+88533dc8b582309bf3ee@syzkaller.appspotmail.com, Nikolay Aleksandrov , "David S. Miller" Subject: [PATCH 5.2 18/56] net: bridge: delete local fdb on device init failure Date: Thu, 8 Aug 2019 21:04:44 +0200 Message-Id: <20190808190453.579244320@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190808190452.867062037@linuxfoundation.org> References: <20190808190452.867062037@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 d7bae09fa008c6c9a489580db0a5a12063b97f97 ] On initialization failure we have to delete the local fdb which was inserted due to the default pvid creation. This problem has been present since the inception of default_pvid. Note that currently there are 2 cases: 1) in br_dev_init() when br_multicast_init() fails 2) if register_netdevice() fails after calling ndo_init() This patch takes care of both since br_vlan_flush() is called on both occasions. Also the new fdb delete would be a no-op on normal bridge device destruction since the local fdb would've been already flushed by br_dev_delete(). This is not an issue for ports since nbp_vlan_init() is called last when adding a port thus nothing can fail after it. Reported-by: syzbot+88533dc8b582309bf3ee@syzkaller.appspotmail.com Fixes: 5be5a2df40f0 ("bridge: Add filtering support for default_pvid") Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_vlan.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -715,6 +715,11 @@ void br_vlan_flush(struct net_bridge *br ASSERT_RTNL(); + /* delete auto-added default pvid local fdb before flushing vlans + * otherwise it will be leaked on bridge device init failure + */ + br_fdb_delete_by_port(br, NULL, 0, 1); + vg = br_vlan_group(br); __vlan_flush(vg); RCU_INIT_POINTER(br->vlgrp, NULL);