Commit 0452800f authored by Chuanhong Guo's avatar Chuanhong Guo Committed by David S. Miller

net: dsa: mt7530: fix null pointer dereferencing in port5 setup

The 2nd gmac of mediatek soc ethernet may not be connected to a PHY
and a phy-handle isn't always available.
Unfortunately, mt7530 dsa driver assumes that the 2nd gmac is always
connected to switch port 5 and setup mt7530 according to phy address
of 2nd gmac node, causing null pointer dereferencing when phy-handle
isn't defined in dts.
This commit fix this setup code by checking return value of
of_parse_phandle before using it.

Fixes: 38f790a8 ("net: dsa: mt7530: Add support for port 5")
Signed-off-by: default avatarChuanhong Guo <gch981213@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarRené van Dorst <opensource@vdorst.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c85adced
...@@ -1403,6 +1403,9 @@ mt7530_setup(struct dsa_switch *ds) ...@@ -1403,6 +1403,9 @@ mt7530_setup(struct dsa_switch *ds)
continue; continue;
phy_node = of_parse_phandle(mac_np, "phy-handle", 0); phy_node = of_parse_phandle(mac_np, "phy-handle", 0);
if (!phy_node)
continue;
if (phy_node->parent == priv->dev->of_node->parent) { if (phy_node->parent == priv->dev->of_node->parent) {
ret = of_get_phy_mode(mac_np, &interface); ret = of_get_phy_mode(mac_np, &interface);
if (ret && ret != -ENODEV) if (ret && ret != -ENODEV)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment