[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250322143314.1806893-1-b.spranger@linutronix.de>
Date: Sat, 22 Mar 2025 15:33:14 +0100
From: Benedikt Spranger <b.spranger@...utronix.de>
To: netdev@...r.kernel.org
Cc: Roger Quadros <rogerq@...nel.org>,
MD Danish Anwar <danishanwar@...com>,
Andrew Lunn <andrew+netdev@...n.ch>
Subject: [PATCH] net: ti: icssg-prueth: Check return value to avoid a kernel oops
of_get_ethdev_address() may fail, do not set a MAC address and return
an error. The icssg-prueth driver ignores that failure and try to validate
the MAC address. This let to a NULL pointer dereference in this case.
Check the return value of of_get_ethdev_address() before validating the
MAC address.
Signed-off-by: Benedikt Spranger <b.spranger@...utronix.de>
---
drivers/net/ethernet/ti/icssg/icssg_prueth.c | 2 +-
drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
index 9a75733e3f8f..273615c8923c 100644
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
@@ -1152,7 +1152,7 @@ static int prueth_netdev_init(struct prueth *prueth,
/* get mac address from DT and set private and netdev addr */
ret = of_get_ethdev_address(eth_node, ndev);
- if (!is_valid_ether_addr(ndev->dev_addr)) {
+ if (ret || !is_valid_ether_addr(ndev->dev_addr)) {
eth_hw_addr_random(ndev);
dev_warn(prueth->dev, "port %d: using random MAC addr: %pM\n",
port, ndev->dev_addr);
diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c b/drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c
index 64a19ff39562..61c5e10e7077 100644
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c
@@ -862,7 +862,7 @@ static int prueth_netdev_init(struct prueth *prueth,
/* get mac address from DT and set private and netdev addr */
ret = of_get_ethdev_address(eth_node, ndev);
- if (!is_valid_ether_addr(ndev->dev_addr)) {
+ if (ret || !is_valid_ether_addr(ndev->dev_addr)) {
eth_hw_addr_random(ndev);
dev_warn(prueth->dev, "port %d: using random MAC addr: %pM\n",
port, ndev->dev_addr);
--
2.39.5
Powered by blists - more mailing lists