| Message ID | E1mVxSO-000aHB-P0@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [RFT,net-next] net: mdio: ensure the type of mdio devices match mdio drivers | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: linux@armlinux.org.uk |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 12 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Thu, Sep 30, 2021 at 03:54:44PM +0100, Russell King (Oracle) wrote: > On the MDIO bus, we have PHYLIB devices and drivers, and we have non- > PHYLIB devices and drivers. PHYLIB devices are MDIO devices that are > wrapped with a struct phy_device. > > Trying to bind a MDIO device with a PHYLIB driver results in out-of- > bounds accesses as we attempt to access struct phy_device members. So, > let's prevent this by ensuring that the type of the MDIO device > (indicated by the MDIO_DEVICE_FLAG_PHY flag) matches the type of the > MDIO driver (indicated by the MDIO_DEVICE_IS_PHY flag.) > > Link: https://lore.kernel.org/r/2b1dc053-8c9a-e3e4-b450-eecdfca3fe16@gmail.com > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > Tested locally in SolidRun Clearfog, DSA switch and PHY get probed > correctly. Further testing welcomed. > > drivers/net/phy/mdio_bus.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c > index 53f034fc2ef7..779e49715e91 100644 > --- a/drivers/net/phy/mdio_bus.c > +++ b/drivers/net/phy/mdio_bus.c > @@ -939,6 +939,12 @@ EXPORT_SYMBOL_GPL(mdiobus_modify); > static int mdio_bus_match(struct device *dev, struct device_driver *drv) > { > struct mdio_device *mdio = to_mdio_device(dev); > + struct mdio_driver *mdiodrv = to_mdio_driver(drv); DaveM would request these two lines are swapped for reverse Christmas tree. Andrew
On Thu, Sep 30, 2021 at 04:58:53PM +0200, Andrew Lunn wrote: > On Thu, Sep 30, 2021 at 03:54:44PM +0100, Russell King (Oracle) wrote: > > On the MDIO bus, we have PHYLIB devices and drivers, and we have non- > > PHYLIB devices and drivers. PHYLIB devices are MDIO devices that are > > wrapped with a struct phy_device. > > > > Trying to bind a MDIO device with a PHYLIB driver results in out-of- > > bounds accesses as we attempt to access struct phy_device members. So, > > let's prevent this by ensuring that the type of the MDIO device > > (indicated by the MDIO_DEVICE_FLAG_PHY flag) matches the type of the > > MDIO driver (indicated by the MDIO_DEVICE_IS_PHY flag.) > > > > Link: https://lore.kernel.org/r/2b1dc053-8c9a-e3e4-b450-eecdfca3fe16@gmail.com > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > > --- > > Tested locally in SolidRun Clearfog, DSA switch and PHY get probed > > correctly. Further testing welcomed. > > > > drivers/net/phy/mdio_bus.c | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c > > index 53f034fc2ef7..779e49715e91 100644 > > --- a/drivers/net/phy/mdio_bus.c > > +++ b/drivers/net/phy/mdio_bus.c > > @@ -939,6 +939,12 @@ EXPORT_SYMBOL_GPL(mdiobus_modify); > > static int mdio_bus_match(struct device *dev, struct device_driver *drv) > > { > > struct mdio_device *mdio = to_mdio_device(dev); > > + struct mdio_driver *mdiodrv = to_mdio_driver(drv); > > DaveM would request these two lines are swapped for reverse Christmas tree. Yep. I'll get around to that sometime.
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 53f034fc2ef7..779e49715e91 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -939,6 +939,12 @@ EXPORT_SYMBOL_GPL(mdiobus_modify); static int mdio_bus_match(struct device *dev, struct device_driver *drv) { struct mdio_device *mdio = to_mdio_device(dev); + struct mdio_driver *mdiodrv = to_mdio_driver(drv); + + /* Both the driver and device must type-match */ + if (!(mdiodrv->mdiodrv.flags & MDIO_DEVICE_IS_PHY) != + !(mdio->flags & MDIO_DEVICE_FLAG_PHY)) + return 0; if (of_driver_match_device(dev, drv)) return 1;
On the MDIO bus, we have PHYLIB devices and drivers, and we have non- PHYLIB devices and drivers. PHYLIB devices are MDIO devices that are wrapped with a struct phy_device. Trying to bind a MDIO device with a PHYLIB driver results in out-of- bounds accesses as we attempt to access struct phy_device members. So, let's prevent this by ensuring that the type of the MDIO device (indicated by the MDIO_DEVICE_FLAG_PHY flag) matches the type of the MDIO driver (indicated by the MDIO_DEVICE_IS_PHY flag.) Link: https://lore.kernel.org/r/2b1dc053-8c9a-e3e4-b450-eecdfca3fe16@gmail.com Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- Tested locally in SolidRun Clearfog, DSA switch and PHY get probed correctly. Further testing welcomed. drivers/net/phy/mdio_bus.c | 6 ++++++ 1 file changed, 6 insertions(+)