Commit 6da69b1d authored by Xiaomeng Tong's avatar Xiaomeng Tong Committed by Jakub Kicinski

net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator

The bug is here:
	return rule;

The list iterator value 'rule' will *always* be set and non-NULL
by list_for_each_entry(), so it is incorrect to assume that the
iterator value will be NULL if the list is empty or no element
is found.

To fix the bug, return 'rule' when found, otherwise return NULL.

Fixes: ae7a5aff ("net: dsa: bcm_sf2: Keep copy of inserted rules")
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarXiaomeng Tong <xiam0nd.tong@gmail.com>
Link: https://lore.kernel.org/r/20220328032431.22538-1-xiam0nd.tong@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dcf50006
...@@ -567,14 +567,14 @@ static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv, ...@@ -567,14 +567,14 @@ static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv,
static struct cfp_rule *bcm_sf2_cfp_rule_find(struct bcm_sf2_priv *priv, static struct cfp_rule *bcm_sf2_cfp_rule_find(struct bcm_sf2_priv *priv,
int port, u32 location) int port, u32 location)
{ {
struct cfp_rule *rule = NULL; struct cfp_rule *rule;
list_for_each_entry(rule, &priv->cfp.rules_list, next) { list_for_each_entry(rule, &priv->cfp.rules_list, next) {
if (rule->port == port && rule->fs.location == location) if (rule->port == port && rule->fs.location == location)
break; return rule;
} }
return rule; return NULL;
} }
static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port, static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment