net: dsa: tag_{e}dsa.c: Remove dependency on platform data

The platform data nr_chips is used when validating a received packet,
to ensure it comes from a know switch chip. The number of possible
switches is limited to DSA_MAX_SWITCHES, so use this as the first
validation step. The new binding allows holes in the dst->ds[] array,
so also ensure ensure there is a valid dsa_switch for this packet.

Signed-off-by: Andrew Lunn <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Reviewed-by: Vivien Didelot <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index aa780e4ac0bd9653618c2b4c582d882cfb52f94a..f9832f097681a51ab5c88fe87e6c112540c447c0 100644 (file)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -107,9 +107,13 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,
         * Check that the source device exists and that the source
         * port is a registered DSA port.
         */
-       if (source_device >= dst->pd->nr_chips)
+       if (source_device >= DSA_MAX_SWITCHES)
                goto out_drop;
+
        ds = dst->ds[source_device];
+       if (!ds)
+               goto out_drop;
+
        if (source_port >= DSA_MAX_PORTS || ds->ports[source_port] == NULL)
                goto out_drop;
 

diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 2288c8098c42800c6477068c0334d7e1874ba608..3890aac8190ffade61db136e2d00663e34a831c8 100644 (file)
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -120,9 +120,13 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
         * Check that the source device exists and that the source
         * port is a registered DSA port.
         */
-       if (source_device >= dst->pd->nr_chips)
+       if (source_device >= DSA_MAX_SWITCHES)
                goto out_drop;
+
        ds = dst->ds[source_device];
+       if (!ds)
+               goto out_drop;
+
        if (source_port >= DSA_MAX_PORTS || ds->ports[source_port] == NULL)
                goto out_drop;