From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: rcz@pengutronix.de, ske@pengutronix.de,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] mdio_bus: add NULL check to mdiobus_read/mdiobus_write
Date: Mon, 14 Oct 2024 10:55:06 +0200 [thread overview]
Message-ID: <20241014085506.2207866-1-a.fatoum@pengutronix.de> (raw)
These functions shouldn't be called with a NULL pointer as argument in
the first place, but this happened at least twice so far[1][2], because
drivers weren't tested in fixed-link setups without PHYs.
To improve user experience, let's return -EIO instead of crashing
outright. The proper fix is still to adapt these drivers, so they
do not try to access non-existent PHYs.
[1]: commit 6269556397 ("net: eqos: let phy_resume handle fixed link phys")
[2]: https://lore.barebox.org/barebox/20241010-fix-designware-fixed-link-v1-1-de2df5485a25@pengutronix.de/T/#u
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/net/phy/mdio_bus.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 30d5aeacff0d..68652e92a830 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -441,6 +441,9 @@ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
{
int ret;
+ if (!bus)
+ return -EIO;
+
slice_acquire(&bus->slice);
ret = bus->read(bus, addr, regnum);
@@ -461,6 +464,9 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
{
int ret;
+ if (!bus)
+ return -EIO;
+
slice_acquire(&bus->slice);
ret = bus->write(bus, addr, regnum, val);
--
2.39.5
next reply other threads:[~2024-10-14 9:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 8:55 Ahmad Fatoum [this message]
2024-10-14 9:24 ` Stefan Kerkmann
2024-10-14 11:13 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241014085506.2207866-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=rcz@pengutronix.de \
--cc=ske@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox