net: mscc: ocelot: fix using match before it is set

Clang static analysis reports this issue
ocelot_flower.c:563:8: warning: 1st function call argument
  is an uninitialized value
    !is_zero_ether_addr(match.mask->dst)) {
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The variable match is used before it is set.  So move the
block.

Fixes: fd66c57872fc ("net: mscc: ocelot: offload ingress skbedit and vlan actions to VCAP IS1")
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
index 4a0fda22d3436b94ab75492eca3379caad5fe136..949858891973d4bd6c03406dcd087710839ac0e7 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -559,13 +559,6 @@ ocelot_flower_parse_key(struct ocelot *ocelot, int port, bool ingress,
                        return -EOPNOTSUPP;
                }
 
-               if (filter->block_id == VCAP_IS1 &&
-                   !is_zero_ether_addr(match.mask->dst)) {
-                       NL_SET_ERR_MSG_MOD(extack,
-                                          "Key type S1_NORMAL cannot match on destination MAC");
-                       return -EOPNOTSUPP;
-               }
-
                /* The hw support mac matches only for MAC_ETYPE key,
                 * therefore if other matches(port, tcp flags, etc) are added
                 * then just bail out
@@ -580,6 +573,14 @@ ocelot_flower_parse_key(struct ocelot *ocelot, int port, bool ingress,
                        return -EOPNOTSUPP;
 
                flow_rule_match_eth_addrs(rule, &match);
+
+               if (filter->block_id == VCAP_IS1 &&
+                   !is_zero_ether_addr(match.mask->dst)) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Key type S1_NORMAL cannot match on destination MAC");
+                       return -EOPNOTSUPP;
+               }
+
                filter->key_type = OCELOT_VCAP_KEY_ETYPE;
                ether_addr_copy(filter->key.etype.dmac.value,
                                match.key->dst);