From ebb8ff61ad97bd1c9721b049497ddb80030eeb0f Mon Sep 17 00:00:00 2001
From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Mon, 11 Jul 2022 19:40:13 +0200
Subject: [PATCH] net: phy: possible NULL dereference in fixed_phy_create()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
We check if phydev is NULL. Only but if it is non-NULL we set one
component of phydev. But even if it is NULL we set another. We should not
dereference NULL in either case.
Fixes: e24b58f5ed4f ("net: phy: don't require PHY interface mode during PHY creation")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Marek Behún <kabel@kernel.org>
---
drivers/net/phy/phy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e6e1755518..0350afdd1b 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -984,10 +984,10 @@ struct phy_device *fixed_phy_create(ofnode node)
}
phydev = phy_device_create(NULL, 0, PHY_FIXED_ID, false);
- if (phydev)
+ if (phydev) {
phydev->node = subnode;
-
- phydev->interface = ofnode_read_phy_mode(node);
+ phydev->interface = ofnode_read_phy_mode(node);
+ }
return phydev;
}
--
2.39.5