| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20220105115122.im4mjibimd7vq7ou@skbuf>
Date: Wed, 5 Jan 2022 11:51:23 +0000
From: Vladimir Oltean <vladimir.oltean@....com>
To: Horatiu Vultur <horatiu.vultur@...rochip.com>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>, Andrew Lunn <andrew@...n.ch>,
Vivien Didelot <vivien.didelot@...il.com>,
Florian Fainelli <f.fainelli@...il.com>
Subject: Re: [PATCH net-next 07/15] net: dsa: remove cross-chip support for
MRP
On Wed, Jan 05, 2022 at 11:01:52AM +0100, Horatiu Vultur wrote:
> The 01/04/2022 19:14, Vladimir Oltean wrote:
> >
> > The cross-chip notifiers for MRP are bypass operations, meaning that
> > even though all switches in a tree are notified, only the switch
> > specified in the info structure is targeted.
> >
> > We can eliminate the unnecessary complexity by deleting the cross-chip
> > notifier logic and calling the ds->ops straight from port.c.
>
> It looks like structs dsa_notifier_mrp_info and
> dsa_notifier_mrp_ring_role_info are not used anywhere anymore. So they
> should also be deleted.
Well spotted, thanks.
> >
> > Cc: Horatiu Vultur <horatiu.vultur@...rochip.com>
> > Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
> > ---
> > net/dsa/dsa_priv.h | 4 ---
> > net/dsa/port.c | 44 +++++++++++++++----------------
> > net/dsa/switch.c | 64 ----------------------------------------------
> > 3 files changed, 20 insertions(+), 92 deletions(-)
> >
> > diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
> > index b5ae21f172a8..54c23479b9ba 100644
> > --- a/net/dsa/dsa_priv.h
> > +++ b/net/dsa/dsa_priv.h
> > @@ -40,10 +40,6 @@ enum {
> > DSA_NOTIFIER_TAG_PROTO,
> > DSA_NOTIFIER_TAG_PROTO_CONNECT,
> > DSA_NOTIFIER_TAG_PROTO_DISCONNECT,
> > - DSA_NOTIFIER_MRP_ADD,
> > - DSA_NOTIFIER_MRP_DEL,
> > - DSA_NOTIFIER_MRP_ADD_RING_ROLE,
> > - DSA_NOTIFIER_MRP_DEL_RING_ROLE,
> > DSA_NOTIFIER_TAG_8021Q_VLAN_ADD,
> > DSA_NOTIFIER_TAG_8021Q_VLAN_DEL,
> > };
> > diff --git a/net/dsa/port.c b/net/dsa/port.c
> > index 05677e016982..5c72f890c6a2 100644
> > --- a/net/dsa/port.c
> > +++ b/net/dsa/port.c
> > @@ -907,49 +907,45 @@ int dsa_port_vlan_del(struct dsa_port *dp,
> > int dsa_port_mrp_add(const struct dsa_port *dp,
> > const struct switchdev_obj_mrp *mrp)
> > {
> > - struct dsa_notifier_mrp_info info = {
> > - .sw_index = dp->ds->index,
> > - .port = dp->index,
> > - .mrp = mrp,
> > - };
> > + struct dsa_switch *ds = dp->ds;
> > +
> > + if (!ds->ops->port_mrp_add)
> > + return -EOPNOTSUPP;
> >
> > - return dsa_port_notify(dp, DSA_NOTIFIER_MRP_ADD, &info);
> > + return ds->ops->port_mrp_add(ds, dp->index, mrp);
> > }
> >
> > int dsa_port_mrp_del(const struct dsa_port *dp,
> > const struct switchdev_obj_mrp *mrp)
> > {
> > - struct dsa_notifier_mrp_info info = {
> > - .sw_index = dp->ds->index,
> > - .port = dp->index,
> > - .mrp = mrp,
> > - };
> > + struct dsa_switch *ds = dp->ds;
> > +
> > + if (!ds->ops->port_mrp_del)
> > + return -EOPNOTSUPP;
> >
> > - return dsa_port_notify(dp, DSA_NOTIFIER_MRP_DEL, &info);
> > + return ds->ops->port_mrp_del(ds, dp->index, mrp);
> > }
> >
> > int dsa_port_mrp_add_ring_role(const struct dsa_port *dp,
> > const struct switchdev_obj_ring_role_mrp *mrp)
> > {
> > - struct dsa_notifier_mrp_ring_role_info info = {
> > - .sw_index = dp->ds->index,
> > - .port = dp->index,
> > - .mrp = mrp,
> > - };
> > + struct dsa_switch *ds = dp->ds;
> > +
> > + if (!ds->ops->port_mrp_add)
> > + return -EOPNOTSUPP;
> >
> > - return dsa_port_notify(dp, DSA_NOTIFIER_MRP_ADD_RING_ROLE, &info);
> > + return ds->ops->port_mrp_add_ring_role(ds, dp->index, mrp);
> > }
> >
> > int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,
> > const struct switchdev_obj_ring_role_mrp *mrp)
> > {
> > - struct dsa_notifier_mrp_ring_role_info info = {
> > - .sw_index = dp->ds->index,
> > - .port = dp->index,
> > - .mrp = mrp,
> > - };
> > + struct dsa_switch *ds = dp->ds;
> > +
> > + if (!ds->ops->port_mrp_del)
> > + return -EOPNOTSUPP;
> >
> > - return dsa_port_notify(dp, DSA_NOTIFIER_MRP_DEL_RING_ROLE, &info);
> > + return ds->ops->port_mrp_del_ring_role(ds, dp->index, mrp);
> > }
> >
> > void dsa_port_set_tag_protocol(struct dsa_port *cpu_dp,
> > diff --git a/net/dsa/switch.c b/net/dsa/switch.c
> > index 393f2d8a860a..a164ec02b4e9 100644
> > --- a/net/dsa/switch.c
> > +++ b/net/dsa/switch.c
> > @@ -701,58 +701,6 @@ dsa_switch_disconnect_tag_proto(struct dsa_switch *ds,
> > return 0;
> > }
> >
> > -static int dsa_switch_mrp_add(struct dsa_switch *ds,
> > - struct dsa_notifier_mrp_info *info)
> > -{
> > - if (!ds->ops->port_mrp_add)
> > - return -EOPNOTSUPP;
> > -
> > - if (ds->index == info->sw_index)
> > - return ds->ops->port_mrp_add(ds, info->port, info->mrp);
> > -
> > - return 0;
> > -}
> > -
> > -static int dsa_switch_mrp_del(struct dsa_switch *ds,
> > - struct dsa_notifier_mrp_info *info)
> > -{
> > - if (!ds->ops->port_mrp_del)
> > - return -EOPNOTSUPP;
> > -
> > - if (ds->index == info->sw_index)
> > - return ds->ops->port_mrp_del(ds, info->port, info->mrp);
> > -
> > - return 0;
> > -}
> > -
> > -static int
> > -dsa_switch_mrp_add_ring_role(struct dsa_switch *ds,
> > - struct dsa_notifier_mrp_ring_role_info *info)
> > -{
> > - if (!ds->ops->port_mrp_add)
> > - return -EOPNOTSUPP;
> > -
> > - if (ds->index == info->sw_index)
> > - return ds->ops->port_mrp_add_ring_role(ds, info->port,
> > - info->mrp);
> > -
> > - return 0;
> > -}
> > -
> > -static int
> > -dsa_switch_mrp_del_ring_role(struct dsa_switch *ds,
> > - struct dsa_notifier_mrp_ring_role_info *info)
> > -{
> > - if (!ds->ops->port_mrp_del)
> > - return -EOPNOTSUPP;
Upon further self-review I found a bug here and in dsa_switch_mrp_add_ring_role,
that the incorrect function pointer is checked. If a driver implements
ds->ops->port_mrp_del but not ds->ops->port_mrp_del_ring_role, this will
cause a NULL pointer dereference. I'll submit a separate patch to
net-next for this (it's a bug but an inconsequential one, since there
isn't any DSA driver in that situation).
> > -
> > - if (ds->index == info->sw_index)
> > - return ds->ops->port_mrp_del_ring_role(ds, info->port,
> > - info->mrp);
> > -
> > - return 0;
> > -}
> > -
> > static int dsa_switch_event(struct notifier_block *nb,
> > unsigned long event, void *info)
> > {
> > @@ -826,18 +774,6 @@ static int dsa_switch_event(struct notifier_block *nb,
> > case DSA_NOTIFIER_TAG_PROTO_DISCONNECT:
> > err = dsa_switch_disconnect_tag_proto(ds, info);
> > break;
> > - case DSA_NOTIFIER_MRP_ADD:
> > - err = dsa_switch_mrp_add(ds, info);
> > - break;
> > - case DSA_NOTIFIER_MRP_DEL:
> > - err = dsa_switch_mrp_del(ds, info);
> > - break;
> > - case DSA_NOTIFIER_MRP_ADD_RING_ROLE:
> > - err = dsa_switch_mrp_add_ring_role(ds, info);
> > - break;
> > - case DSA_NOTIFIER_MRP_DEL_RING_ROLE:
> > - err = dsa_switch_mrp_del_ring_role(ds, info);
> > - break;
> > case DSA_NOTIFIER_TAG_8021Q_VLAN_ADD:
> > err = dsa_switch_tag_8021q_vlan_add(ds, info);
> > break;
> > --
> > 2.25.1
> >
>
> --
> /Horatiu
Powered by blists - more mailing lists