From: Ido Schimmel <idosch@idosch.org>
To: Nikolay Aleksandrov <nikolay@nvidia.com>
Cc: syzbot+9ba1174359adba5a5b7c@syzkaller.appspotmail.com,
Jiri Pirko <jiri@resnulli.us>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
bridge@lists.linux-foundation.org,
syzkaller-bugs <syzkaller-bugs@googlegroups.com>,
netdev@vger.kernel.org, Roopa Prabhu <roopa@nvidia.com>,
Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [Bridge] [PATCH net] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry
Date: Tue, 10 Aug 2021 09:40:15 +0300 [thread overview]
Message-ID: <YRIfT6vLL16hr+7p@shredder> (raw)
In-Reply-To: <da3ddeb1-eef1-a755-dfa0-737e32065d67@nvidia.com>
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 <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.com>
> 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,
>
>
WARNING: multiple messages have this Message-ID (diff)
From: Ido Schimmel <idosch@idosch.org>
To: Nikolay Aleksandrov <nikolay@nvidia.com>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>,
netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@resnulli.us>, Roopa Prabhu <roopa@nvidia.com>,
bridge@lists.linux-foundation.org,
syzkaller-bugs <syzkaller-bugs@googlegroups.com>,
syzbot+9ba1174359adba5a5b7c@syzkaller.appspotmail.com
Subject: Re: [PATCH net] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry
Date: Tue, 10 Aug 2021 09:40:15 +0300 [thread overview]
Message-ID: <YRIfT6vLL16hr+7p@shredder> (raw)
In-Reply-To: <da3ddeb1-eef1-a755-dfa0-737e32065d67@nvidia.com>
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 <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.com>
> 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,
>
>
next prev parent reply other threads:[~2021-08-10 6:40 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-01 23:17 [Bridge] [PATCH net] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry Vladimir Oltean
2021-08-01 23:17 ` Vladimir Oltean
2021-08-02 7:42 ` [Bridge] " Nikolay Aleksandrov
2021-08-02 7:42 ` Nikolay Aleksandrov
2021-08-02 9:20 ` [Bridge] " Vladimir Oltean
2021-08-02 9:20 ` Vladimir Oltean
2021-08-02 9:42 ` [Bridge] " Nikolay Aleksandrov
2021-08-02 9:42 ` Nikolay Aleksandrov
2021-08-02 10:52 ` [Bridge] " Vladimir Oltean
2021-08-02 10:52 ` Vladimir Oltean
2021-08-02 11:02 ` [Bridge] " Nikolay Aleksandrov
2021-08-02 11:02 ` Nikolay Aleksandrov
2021-08-02 11:20 ` [Bridge] " Vladimir Oltean
2021-08-02 11:20 ` Vladimir Oltean
2021-08-02 11:25 ` [Bridge] " Nikolay Aleksandrov
2021-08-02 11:25 ` Nikolay Aleksandrov
2021-08-02 22:10 ` [Bridge] " patchwork-bot+netdevbpf
2021-08-02 22:10 ` patchwork-bot+netdevbpf
2021-08-09 12:16 ` [Bridge] " Ido Schimmel
2021-08-09 12:16 ` Ido Schimmel
2021-08-09 12:32 ` [Bridge] " Vladimir Oltean
2021-08-09 12:32 ` Vladimir Oltean
2021-08-09 15:33 ` [Bridge] " Nikolay Aleksandrov
2021-08-09 15:33 ` Nikolay Aleksandrov
2021-08-10 6:40 ` Ido Schimmel [this message]
2021-08-10 6:40 ` Ido Schimmel
2021-08-10 7:21 ` [Bridge] [PATCH net] net: bridge: fix flags interpretation for extern learn fdb entries Nikolay Aleksandrov
2021-08-10 7:21 ` Nikolay Aleksandrov
2021-08-10 11:00 ` [Bridge] [PATCH net v2] " Nikolay Aleksandrov
2021-08-10 11:00 ` Nikolay Aleksandrov
2021-08-10 13:50 ` [Bridge] " Vladimir Oltean
2021-08-10 13:50 ` Vladimir Oltean
2021-08-10 20:20 ` [Bridge] " patchwork-bot+netdevbpf
2021-08-10 20:20 ` patchwork-bot+netdevbpf
2021-08-09 16:05 ` [Bridge] [PATCH net] net: bridge: validate the NUD_PERMANENT bit when adding an extern_learn FDB entry Vladimir Oltean
2021-08-09 16:05 ` Vladimir Oltean
2021-08-10 6:46 ` [Bridge] " Ido Schimmel
2021-08-10 6:46 ` Ido Schimmel
2021-08-10 10:09 ` [Bridge] " Vladimir Oltean
2021-08-10 10:09 ` Vladimir Oltean
2021-08-10 10:15 ` [Bridge] " Nikolay Aleksandrov
2021-08-10 10:15 ` Nikolay Aleksandrov
2021-08-10 10:38 ` [Bridge] " Vladimir Oltean
2021-08-10 10:38 ` Vladimir Oltean
2021-08-10 10:43 ` [Bridge] " Nikolay Aleksandrov
2021-08-10 10:43 ` Nikolay Aleksandrov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YRIfT6vLL16hr+7p@shredder \
--to=idosch@idosch.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
--cc=syzbot+9ba1174359adba5a5b7c@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.