aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2018-10-25 14:42:38 +0200
committerDavid S. Miller <davem@davemloft.net>2018-10-25 16:19:09 -0700
commitf802912d42525eddb2e504b0b852539f46c8fd9d (patch)
treed4989bda0e19ae9baba10cb62c2198eb3489264e /drivers/net
parentr8169: fix broken Wake-on-LAN from S5 (poweroff) (diff)
downloadlinux-dev-f802912d42525eddb2e504b0b852539f46c8fd9d.tar.xz
linux-dev-f802912d42525eddb2e504b0b852539f46c8fd9d.zip
net: phy: genphy_10g_driver: Avoid NULL pointer dereference
This driver got missed during the recent change of .features from a u32 to a pointer to a Linux bitmap. Change the initialisation from 0 to PHY_10GBIT_FEATURES so removing the danger of a NULL pointer dereference. Fixes: 719655a14971 ("net: phy: Replace phy driver features u32 with link_mode bitmap") Reported-by: Jose Abreu <jose.abreu@synopsys.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/phy-c45.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index e1225545362d..d7636ff03bc7 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -329,7 +329,7 @@ struct phy_driver genphy_10g_driver = {
.name = "Generic 10G PHY",
.soft_reset = gen10g_no_soft_reset,
.config_init = gen10g_config_init,
- .features = 0,
+ .features = PHY_10GBIT_FEATURES,
.config_aneg = gen10g_config_aneg,
.read_status = gen10g_read_status,
.suspend = gen10g_suspend,