forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

net: phy: micrel: Allow probing without .driver_data

Browse source 
[ Upstream commit f2ef6f7539 ]

Currently, if the .probe element is present in the phy_driver structure
and the .driver_data is not, a NULL pointer dereference happens.

Allow passing .probe without .driver_data by inserting NULL checks
for priv->type.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220513114613.762810-1-festevam@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Fabio Estevam 2022-05-13 08:46:12 -03:00 • committed by Greg Kroah-Hartman
commit abb5594ae2
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/phy/micrel.c
View file

@ -283,7 +283,7 @@ static int kszphy_config_reset(struct phy_device *phydev)
} }
} }
if (priv->led_mode >= 0) if (priv->type && priv->led_mode >= 0)
kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode); kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);
return 0; return 0;
@ -299,10 +299,10 @@ static int kszphy_config_init(struct phy_device *phydev)
type = priv->type; type = priv->type;
if (type->has_broadcast_disable) if (type && type->has_broadcast_disable)
kszphy_broadcast_disable(phydev); kszphy_broadcast_disable(phydev);
if (type->has_nand_tree_disable) if (type && type->has_nand_tree_disable)
kszphy_nand_tree_disable(phydev); kszphy_nand_tree_disable(phydev);
return kszphy_config_reset(phydev); return kszphy_config_reset(phydev);
@ -1112,7 +1112,7 @@ static int kszphy_probe(struct phy_device *phydev)
priv->type = type; priv->type = type;
if (type->led_mode_reg) { if (type && type->led_mode_reg) {
ret = of_property_read_u32(np, "micrel,led-mode", ret = of_property_read_u32(np, "micrel,led-mode",
&priv->led_mode); &priv->led_mode);
if (ret) if (ret)
@ -1133,7 +1133,8 @@ static int kszphy_probe(struct phy_device *phydev)
unsigned long rate = clk_get_rate(clk); unsigned long rate = clk_get_rate(clk);
bool rmii_ref_clk_sel_25_mhz; bool rmii_ref_clk_sel_25_mhz;
priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel; if (type)
priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;
rmii_ref_clk_sel_25_mhz = of_property_read_bool(np, rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,
"micrel,rmii-reference-clock-select-25-mhz"); "micrel,rmii-reference-clock-select-25-mhz");