Skip to content

Commit 4e9a613

Browse files
error27kuba-moo
authored andcommitted
net: microchip: sparx5: fix uninitialized variables
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 <[email protected]> Link: https://lore.kernel.org/r/Y3eg9Ml/LmLR3L3C@kili Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 3263481 commit 4e9a613

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ sparx5_tc_flower_handler_vlan_usage(struct sparx5_tc_flower_parse_usage *st)
341341

342342
st->used_keys |= BIT(FLOW_DISSECTOR_KEY_VLAN);
343343

344-
return err;
344+
return 0;
345345
out:
346346
NL_SET_ERR_MSG_MOD(st->fco->common.extack, "vlan parse error");
347347
return err;
@@ -452,8 +452,10 @@ sparx5_tc_flower_handler_arp_usage(struct sparx5_tc_flower_parse_usage *st)
452452

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

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

478480
st->used_keys |= BIT(FLOW_DISSECTOR_KEY_ARP);
479481

480-
return err;
482+
return 0;
481483

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

0 commit comments

Comments
 (0)