Unverified Commit 0df02409 authored by Sander Vanheule's avatar Sander Vanheule Committed by Mark Brown
Browse files

regmap: mdio: Reject invalid addresses 



When an invalid register offset is provided, the upper bits are silently
discarded. Change this to return -ENXIO instead, to help catch potential
bugs.

Signed-off-by: default avatarSander Vanheule <sander@svanheule.net>
Link: https://lore.kernel.org/r/047007e0e9fb596480829f11f8c7e6281d235c70.1623244066.git.sander@svanheule.net


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce62df22

drivers/base/regmap/regmap-mdio.c

+16 −4
Original line number Diff line number Diff line
@@ -31,14 +31,20 @@ static int regmap_mdio_c22_read(void *context, unsigned int reg, unsigned int *v 
{

	struct mdio_device *mdio_dev = context;



	return regmap_mdio_read(mdio_dev, reg & REGNUM_C22_MASK, val);

	if (unlikely(reg & ~REGNUM_C22_MASK))

		return -ENXIO;



	return regmap_mdio_read(mdio_dev, reg, val);

}



static int regmap_mdio_c22_write(void *context, unsigned int reg, unsigned int val)

{

	struct mdio_device *mdio_dev = context;



	return regmap_mdio_write(mdio_dev, reg & REGNUM_C22_MASK, val);

	if (unlikely(reg & ~REGNUM_C22_MASK))

		return -ENXIO;



	return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val);

}



static const struct regmap_bus regmap_mdio_c22_bus = {
@@ -50,14 +56,20 @@ static int regmap_mdio_c45_read(void *context, unsigned int reg, unsigned int *v 
{

	struct mdio_device *mdio_dev = context;



	return regmap_mdio_read(mdio_dev, MII_ADDR_C45 | (reg & REGNUM_C45_MASK), val);

	if (unlikely(reg & ~REGNUM_C45_MASK))

		return -ENXIO;



	return regmap_mdio_read(mdio_dev, MII_ADDR_C45 | reg, val);

}



static int regmap_mdio_c45_write(void *context, unsigned int reg, unsigned int val)

{

	struct mdio_device *mdio_dev = context;



	return regmap_mdio_write(mdio_dev, MII_ADDR_C45 | (reg & REGNUM_C45_MASK), val);

	if (unlikely(reg & ~REGNUM_C45_MASK))

		return -ENXIO;



	return regmap_mdio_write(mdio_dev, MII_ADDR_C45 | reg, val);

}



static const struct regmap_bus regmap_mdio_c45_bus = {