Commit 3e536cff authored Nov 12, 2018 by Colin Ian King Committed by David S. Miller Nov 12, 2018

net: phy: check if advertising is zero using linkmode_empty

A recent change modified variable advertising from a u32 to a link mode
array and left the u32 zero comparison, so essential we now have an array
being compared to null which is not the intention. Fix this by using the
call to linkmode_empty to check if advertising is all zero.

Detected by CoverityScan, CID#1475424 ("Array compared against 0")

Fixes: 3c1bcc86 ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 261501d9

drivers/net/phy/phy.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -328,7 +328,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
	if (autoneg != AUTONEG_ENABLE && autoneg != AUTONEG_DISABLE)		if (autoneg != AUTONEG_ENABLE && autoneg != AUTONEG_DISABLE)
	return -EINVAL;		return -EINVAL;

	if (autoneg == AUTONEG_ENABLE && advertising == 0)		if (autoneg == AUTONEG_ENABLE && linkmode_empty(advertising))
	return -EINVAL;		return -EINVAL;

	if (autoneg == AUTONEG_DISABLE &&		if (autoneg == AUTONEG_DISABLE &&

Admin message