Commit bfe72442 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

net: phy: micrel: fix crash when statistic requested for KSZ9031 phy 



Now the command:
	ethtool --phy-statistics eth0
will cause system crash with meassage "Unable to handle kernel NULL pointer
dereference at virtual address 00000010" from:

 (kszphy_get_stats) from [<c069f1d8>] (ethtool_get_phy_stats+0xd8/0x210)
 (ethtool_get_phy_stats) from [<c06a0738>] (dev_ethtool+0x5b8/0x228c)
 (dev_ethtool) from [<c06b5484>] (dev_ioctl+0x3fc/0x964)
 (dev_ioctl) from [<c0679f7c>] (sock_ioctl+0x170/0x2c0)
 (sock_ioctl) from [<c02419d4>] (do_vfs_ioctl+0xa8/0x95c)
 (do_vfs_ioctl) from [<c02422c4>] (SyS_ioctl+0x3c/0x64)
 (SyS_ioctl) from [<c0107d60>] (ret_fast_syscall+0x0/0x44)

The reason: phy_driver structure for KSZ9031 phy has no .probe() callback
defined. As result, struct phy_device *phydev->priv pointer will not be
initializes (null).
This issue will affect also following phys:
 KSZ8795, KSZ886X, KSZ8873MLL, KSZ9031, KSZ9021, KSZ8061, KS8737

Fix it by:
- adding .probe() = kszphy_probe() callback to KSZ9031, KSZ9021
phys. The kszphy_probe() can be re-used as it doesn't do any phy specific
settings.
- removing statistic callbacks from other phys (KSZ8795, KSZ886X,
KSZ8873MLL, KSZ8061, KS8737) as they doesn't have corresponding
statistic counters.

Fixes: 2b2427d0 ("phy: micrel: Add ethtool statistics counters")
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 426c87ca

drivers/net/phy/micrel.c

+2 −15
Original line number Diff line number Diff line
@@ -798,9 +798,6 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -940,9 +937,6 @@ static struct phy_driver ksphy_driver[] = { 
	.read_status	= genphy_read_status,

	.ack_interrupt	= kszphy_ack_interrupt,

	.config_intr	= kszphy_config_intr,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -952,6 +946,7 @@ static struct phy_driver ksphy_driver[] = { 
	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.driver_data	= &ksz9021_type,

	.probe		= kszphy_probe,

	.config_init	= ksz9021_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,
@@ -971,6 +966,7 @@ static struct phy_driver ksphy_driver[] = { 
	.features	= PHY_GBIT_FEATURES,

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.driver_data	= &ksz9021_type,

	.probe		= kszphy_probe,

	.config_init	= ksz9031_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= ksz9031_read_status,
@@ -989,9 +985,6 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_aneg	= ksz8873mll_config_aneg,

	.read_status	= ksz8873mll_read_status,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -1003,9 +996,6 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

}, {
@@ -1017,9 +1007,6 @@ static struct phy_driver ksphy_driver[] = { 
	.config_init	= kszphy_config_init,

	.config_aneg	= ksz8873mll_config_aneg,

	.read_status	= ksz8873mll_read_status,

	.get_sset_count = kszphy_get_sset_count,

	.get_strings	= kszphy_get_strings,

	.get_stats	= kszphy_get_stats,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

} };

CRA Git | Maintained and supported by SUSTech CRA and CCSE