Skip to content

Commit

Permalink
net: microchip: sparx5: fix uninitialized variables
Browse files Browse the repository at this point in the history
Smatch complains that "err" can be uninitialized on these paths.  Also
it's just nicer to "return 0;" instead of "return err;"

Fixes: 3a344f9 ("net: microchip: sparx5: Add support for TC flower ARP dissector")
Signed-off-by: Dan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/r/Y3eg9Ml/LmLR3L3C@kili
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Dan Carpenter authored and Jakub Kicinski committed Nov 22, 2022
1 parent 3263481 commit 4e9a613
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ sparx5_tc_flower_handler_vlan_usage(struct sparx5_tc_flower_parse_usage *st)

st->used_keys |= BIT(FLOW_DISSECTOR_KEY_VLAN);

return err;
return 0;
out:
NL_SET_ERR_MSG_MOD(st->fco->common.extack, "vlan parse error");
return err;
Expand Down Expand Up @@ -452,8 +452,10 @@ sparx5_tc_flower_handler_arp_usage(struct sparx5_tc_flower_parse_usage *st)

/* The IS2 ARP keyset does not support ARP hardware addresses */
if (!is_zero_ether_addr(mt.mask->sha) ||
!is_zero_ether_addr(mt.mask->tha))
!is_zero_ether_addr(mt.mask->tha)) {
err = -EINVAL;
goto out;
}

if (mt.mask->sip) {
ipval = be32_to_cpu((__force __be32)mt.key->sip);
Expand All @@ -477,7 +479,7 @@ sparx5_tc_flower_handler_arp_usage(struct sparx5_tc_flower_parse_usage *st)

st->used_keys |= BIT(FLOW_DISSECTOR_KEY_ARP);

return err;
return 0;

out:
NL_SET_ERR_MSG_MOD(st->fco->common.extack, "arp parse error");
Expand Down

0 comments on commit 4e9a613

Please sign in to comment.