| Message ID | 20170109195834.11697-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Florian, Florian Fainelli <f.fainelli@gmail.com> writes: > It is perfectly possible to have non zero indexed switches being present > in a DSA switch tree, in such a case, we will be deferencing a NULL > pointer while dsa_cpu_port_ethtool_{setup,restore}. Be more defensive > and ensure that dst->ds[0] is valid before doing anything with it. > > Fixes: 0c73c523cf73 ("net: dsa: Initialize CPU port ethtool ops per tree") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> The patch is correct since we are already using dst->ds[0] here. But we should stop using that and use dst->cpu_switch instead, because the switch with ID 0 won't necessary be the CPU switch. Now that the Ethernet switch chips are true Linux devices, they are registered in order depending on their bus/address. So in a setup like this: ,--MDIO--@4--------@2-- | | | [CPU] <-> [swA] <-> [swB] swB will have index 0 and swA will have index 1. Please correct me if I'm wrong. Thanks, Vivien
On Mon, Jan 09, 2017 at 03:50:53PM -0500, Vivien Didelot wrote: > Hi Florian, > > Florian Fainelli <f.fainelli@gmail.com> writes: > > > It is perfectly possible to have non zero indexed switches being present > > in a DSA switch tree, in such a case, we will be deferencing a NULL > > pointer while dsa_cpu_port_ethtool_{setup,restore}. Be more defensive > > and ensure that dst->ds[0] is valid before doing anything with it. > > > > Fixes: 0c73c523cf73 ("net: dsa: Initialize CPU port ethtool ops per tree") > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > > Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> > > The patch is correct since we are already using dst->ds[0] here. > > But we should stop using that and use dst->cpu_switch instead, because > the switch with ID 0 won't necessary be the CPU switch. Now that the > Ethernet switch chips are true Linux devices, they are registered in > order depending on their bus/address. So in a setup like this: > > ,--MDIO--@4--------@2-- > | | | > [CPU] <-> [swA] <-> [swB] > > swB will have index 0 and swA will have index 1. Please correct me if > I'm wrong. Correct, which DS has the CPU port is arbitrary. It also gets messier when Johns finishes reworking my PoC patchset for multiple CPU ports. You ideally want the correct CPU port for this host interface. Andrew
From: Florian Fainelli <f.fainelli@gmail.com> Date: Mon, 9 Jan 2017 11:58:34 -0800 > It is perfectly possible to have non zero indexed switches being present > in a DSA switch tree, in such a case, we will be deferencing a NULL > pointer while dsa_cpu_port_ethtool_{setup,restore}. Be more defensive > and ensure that dst->ds[0] is valid before doing anything with it. > > Fixes: 0c73c523cf73 ("net: dsa: Initialize CPU port ethtool ops per tree") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied and queued up for -stable, thanks.
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 5fff951a0a49..da3862124545 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -394,9 +394,11 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) return err; } - err = dsa_cpu_port_ethtool_setup(dst->ds[0]); - if (err) - return err; + if (dst->ds[0]) { + err = dsa_cpu_port_ethtool_setup(dst->ds[0]); + if (err) + return err; + } /* If we use a tagging format that doesn't have an ethertype * field, make sure that all packets from this point on get @@ -433,7 +435,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) dsa_ds_unapply(dst, ds); } - dsa_cpu_port_ethtool_restore(dst->ds[0]); + if (dst->ds[0]) + dsa_cpu_port_ethtool_restore(dst->ds[0]); pr_info("DSA: tree %d unapplied\n", dst->tree); dst->applied = false;
It is perfectly possible to have non zero indexed switches being present in a DSA switch tree, in such a case, we will be deferencing a NULL pointer while dsa_cpu_port_ethtool_{setup,restore}. Be more defensive and ensure that dst->ds[0] is valid before doing anything with it. Fixes: 0c73c523cf73 ("net: dsa: Initialize CPU port ethtool ops per tree") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- net/dsa/dsa2.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)