linux-kernel - [PATCH] net: mscc: ocelot: reinterpret the return value of of_get_phy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 11 Nov 2019 17:21:27 +0100
From:   Horatiu Vultur <horatiu.vultur@...rochip.com>
To:     unlisted-recipients:; (no To-header on input)
CC:     <alexandre.belloni@...tlin.com>, <UNGLinuxDriver@...rochip.com>,
        <davem@...emloft.net>, <andrew@...n.ch>, <netdev@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>,
        Horatiu Vultur <horatiu.vultur@...rochip.com>
Subject: [PATCH] net: mscc: ocelot: reinterpret the return value of of_get_phy_mode

The commit 0c65b2b90d13c ("net: of_get_phy_mode: Change API to solve
int/unit warnings") updated the function of_get_phy_mode declaration.
Now it returns an error code and in case the node doesn't contain the
property 'phy-mode' or 'phy-connection-type' it returns -EINVAL.

In Ocelot the return code of the function was checked against -ENODEV
which is not true so it would failed to probe the port and then
eventually failed to probe the driver.

The fix consists in just checking if the function of_get_phy_mode returns
an error and in that case just fall back and use the interface
PHY_INTERFACE_MODE_NA.

This patch is based on the patch series:
https://patchwork.ozlabs.org/project/netdev/list/?series=141849

Signed-off-by: Horatiu Vultur <horatiu.vultur@...rochip.com>
---
 drivers/net/ethernet/mscc/ocelot_board.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 811599f32910..677701355da2 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
@@ -378,6 +378,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
 		struct phy *serdes;
 		void __iomem *regs;
 		char res_name[8];
+		int phy_err;
 		u32 port;
 
 		if (of_property_read_u32(portnp, "reg", &port))
@@ -410,9 +411,9 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
 		priv = container_of(ocelot_port, struct ocelot_port_private,
 				    port);
 
-		err = of_get_phy_mode(portnp, &phy_mode);
-		if (err && err != -ENODEV)
-			goto out_put_ports;
+		phy_err = of_get_phy_mode(portnp, &phy_mode);
+		if (phy_err)
+			phy_mode = PHY_INTERFACE_MODE_NA;
 
 		priv->phy_mode = phy_mode;
 
-- 
2.17.1