Received-SPF: pass (google.com: domain of linux-kernel+bounces-25753-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Kunwu Chan <chentao@kylinos.cn>
To: andrew@lunn.ch,
	hkallweit1@gmail.com,
	linux@armlinux.org.uk,
	davem@davemloft.net,
	edumazet@google.com,
	kuba@kernel.org,
	pabeni@redhat.com
Cc: f.fainelli@gmail.com,
	netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Kunwu Chan <chentao@kylinos.cn>
Subject: [PATCH net v2] net: phy: Fix possible NULL pointer dereference issues caused by phy_attached_info_irq
Date: Mon, 15 Jan 2024 16:50:18 +0800
Message-Id: <20240115085018.30300-1-chentao@kylinos.cn>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.

phylink_bringup_phy needs to be done, otherwise network interface is
likely to be dead, so when irq_str is NULL, just print an empty string.

Fixes: e27f178793de ("net: phy: Added IRQ print to phylink_bringup_phy()"=
)
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Suggested-by: Andrew Lunn <andrew@lunn.ch>
---
v2: Print empty string when irq_str is NULL in phylink_bringup_phy
---
 drivers/net/phy/phy_device.c | 3 +++
 drivers/net/phy/phylink.c    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 3611ea64875e..10fa99d957c0 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1299,6 +1299,9 @@ void phy_attached_print(struct phy_device *phydev, =
const char *fmt, ...)
 	const char *unbound =3D phydev->drv ? "" : "[unbound] ";
 	char *irq_str =3D phy_attached_info_irq(phydev);
=20
+	if (!irq_str)
+		return;
+
 	if (!fmt) {
 		phydev_info(phydev, ATTACHED_FMT "\n", unbound,
 			    phydev_name(phydev), irq_str);
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index ed0b4ccaa6a6..819574a06036 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1886,7 +1886,7 @@ static int phylink_bringup_phy(struct phylink *pl, =
struct phy_device *phy,
 	irq_str =3D phy_attached_info_irq(phy);
 	phylink_info(pl,
 		     "PHY [%s] driver [%s] (irq=3D%s)\n",
-		     dev_name(&phy->mdio.dev), phy->drv->name, irq_str);
+		     dev_name(&phy->mdio.dev), phy->drv->name, irq_str ? irq_str : "")=
;
 	kfree(irq_str);
=20
 	mutex_lock(&phy->lock);
--=20
2.39.2