net: phy: don't allow __set_phy_supported to add unsupported modes (d2a36971) · Commits · 戴 / test

Currently __set_phy_supported allows to add modes w/o checking whether the PHY supports them. This is wrong, it should never add modes but only remove modes we don't want to support. The commit marked as fixed didn't do anything wrong, it just copied existing functionality to the helper which is being fixed now. Fixes: ("phylib: Add phy_set_max_speed helper") Signed-off-by:

Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy_device.c

+8 −11

Original line number	Diff line number	Diff line
		@@ -1880,20 +1880,17 @@ EXPORT_SYMBOL(genphy_loopback);

		static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)
		{
		phydev->supported &= ~(PHY_1000BT_FEATURES \| PHY_100BT_FEATURES \|
		PHY_10BT_FEATURES);

		switch (max_speed) {
		default:
		return -ENOTSUPP;
		case SPEED_1000:
		phydev->supported \|= PHY_1000BT_FEATURES;
		case SPEED_10:
		phydev->supported &= ~PHY_100BT_FEATURES;
		/* fall through */
		case SPEED_100:
		phydev->supported \|= PHY_100BT_FEATURES;
		/* fall through */
		case SPEED_10:
		phydev->supported \|= PHY_10BT_FEATURES;
		phydev->supported &= ~PHY_1000BT_FEATURES;
		break;
		case SPEED_1000:
		break;
		default:
		return -ENOTSUPP;
		}

		return 0;

Admin message