Commit 7a2ba24c authored Mar 28, 2022 by Xiaomeng Tong Committed by Greg Kroah-Hartman Apr 15, 2022

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



[ Upstream commit 6da69b1da130e7d96766042750cd9f902e890eba ]

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: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
Link: https://lore.kernel.org/r/20220328032431.22538-1-xiam0nd.tong@gmail.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 910a98e5

drivers/net/dsa/bcm_sf2_cfp.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -542,14 +542,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,