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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 54495C4338F for ; Tue, 10 Aug 2021 06:40:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39B1161051 for ; Tue, 10 Aug 2021 06:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236810AbhHJGkr (ORCPT ); Tue, 10 Aug 2021 02:40:47 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:35891 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236694AbhHJGkn (ORCPT ); Tue, 10 Aug 2021 02:40:43 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 87F3D5C0175; Tue, 10 Aug 2021 02:40:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 10 Aug 2021 02:40:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=FwHr25 vlNTA1qSgWCXpq5c5oS2rISuP06w9MQl5CjFg=; b=B9AhNV7LA/M5WPYItG6GYX 42r8HI3De58FWC7IWog4S1XKmSrAIj6F1bUP8U0xsRqCNkrOZhiAHmcCGgeecM4O MotfRwhCd8ofe23M8ac2yzfsg4HqIuSQfW3PcQc8AuV5McYTjBoncOPsF1S99ZRg StnuBAstWmy6oiR1gkT5Pw6lgS+6MzaOpUcHhadhDvL6XfKPj0FPcYnEK3vZpary U0UbyyYN9iWNLgjG9ar4zinfw+0/wxxjHP3FqZnmeNYKiRTYwAvLyNPrg9qoH1kt B9aoyEMrMHWbs8f/I3pXZ8BCAQ0zhk2Slu0B2+ROH6R5OAmfTyk8RAwlcqZqrJrQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrjeekgdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefkughoucfu tghhihhmmhgvlhcuoehiughoshgthhesihguohhstghhrdhorhhgqeenucggtffrrghtth gvrhhnpedtffekkeefudffveegueejffejhfetgfeuuefgvedtieehudeuueekhfduheel teenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehiug hoshgthhesihguohhstghhrdhorhhg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Aug 2021 02:40:19 -0400 (EDT) Date: Tue, 10 Aug 2021 09:40:15 +0300 From: Ido Schimmel To: Nikolay Aleksandrov Cc: Vladimir Oltean , netdev@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Jiri Pirko , Roopa Prabhu , bridge@lists.linux-foundation.org, syzkaller-bugs , syzbot+9ba1174359adba5a5b7c@syzkaller.appspotmail.com Subject: Re: [PATCH net] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry Message-ID: References: <20210801231730.7493-1-vladimir.oltean@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Aug 09, 2021 at 06:33:30PM +0300, Nikolay Aleksandrov wrote: > TBH, I want to keep that error so middle ground would be to handle NUD_PERMANENT only > when used with !p and keep it. :) WDYT ? Yes, works for me > > Solution which forces BR_FDB_LOCAL for !p calls (completely untested): Reviewed-by: Ido Schimmel Tested-by: Ido Schimmel > diff --git a/net/bridge/br.c b/net/bridge/br.c > index c8ae823aa8e7..d3a32c6813e0 100644 > --- a/net/bridge/br.c > +++ b/net/bridge/br.c > @@ -166,8 +166,7 @@ static int br_switchdev_event(struct notifier_block *unused, > case SWITCHDEV_FDB_ADD_TO_BRIDGE: > fdb_info = ptr; > err = br_fdb_external_learn_add(br, p, fdb_info->addr, > - fdb_info->vid, > - fdb_info->is_local, false); > + fdb_info->vid, false); > if (err) { > err = notifier_from_errno(err); > break; > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index b8e22057f680..4e3b1b66f132 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -1255,15 +1255,7 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br, > rcu_read_unlock(); > local_bh_enable(); > } else if (ndm->ndm_flags & NTF_EXT_LEARNED) { > - if (!p && !(ndm->ndm_state & NUD_PERMANENT)) { > - NL_SET_ERR_MSG_MOD(extack, > - "FDB entry towards bridge must be permanent"); > - return -EINVAL; > - } > - > - err = br_fdb_external_learn_add(br, p, addr, vid, > - ndm->ndm_state & NUD_PERMANENT, > - true); > + err = br_fdb_external_learn_add(br, p, addr, vid, true); > } else { > spin_lock_bh(&br->hash_lock); > err = fdb_add_entry(br, p, addr, ndm, nlh_flags, vid, nfea_tb); > @@ -1491,7 +1483,7 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p) > } > > int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, > - const unsigned char *addr, u16 vid, bool is_local, > + const unsigned char *addr, u16 vid, > bool swdev_notify) > { > struct net_bridge_fdb_entry *fdb; > @@ -1509,7 +1501,7 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, > if (swdev_notify) > flags |= BIT(BR_FDB_ADDED_BY_USER); > > - if (is_local) > + if (!p) > flags |= BIT(BR_FDB_LOCAL); > > fdb = fdb_create(br, p, addr, vid, flags); > @@ -1538,7 +1530,7 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, > if (swdev_notify) > set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); > > - if (is_local) > + if (!p) > set_bit(BR_FDB_LOCAL, &fdb->flags); > > if (modified) > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index 86969d1bd036..907e5742b392 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -778,7 +778,7 @@ int br_fdb_get(struct sk_buff *skb, struct nlattr *tb[], struct net_device *dev, > int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p); > void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p); > int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, > - const unsigned char *addr, u16 vid, bool is_local, > + const unsigned char *addr, u16 vid, > bool swdev_notify); > int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p, > const unsigned char *addr, u16 vid, > >