Skip to content

Commit

Permalink
net: phy: fix phy_read_poll_timeout argument type in genphy_loopback
Browse files Browse the repository at this point in the history
read_poll_timeout inside phy_read_poll_timeout can set val negative
in some cases (for example, __mdiobus_read inside phy_read can return
-EOPNOTSUPP).

Supposedly, commit 4ec7329 ("net: phylib: fix phy_read*_poll_timeout()")
should fix problems with wrong-signed vals, but I do not see how
as val is sent to phy_read as is and __val = phy_read (not val)
is checked for sign.

Change val type for signed to allow better error handling as done in other
phy_read_poll_timeout callers. This will not fix any error handling
by itself, but allows, for example, to modify cond with appropriate
sign check or check resulting val separately.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 014068d ("net: phy: genphy_loopback: add link speed configuration")
Signed-off-by: Nikita Kiryushin <[email protected]>
Reviewed-by: Russell King (Oracle) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
  • Loading branch information
nkiryushin authored and Paolo Abeni committed Mar 19, 2024
1 parent 9474c62 commit 32fa436
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/phy/phy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -2831,8 +2831,8 @@ EXPORT_SYMBOL(genphy_resume);
int genphy_loopback(struct phy_device *phydev, bool enable)
{
if (enable) {
u16 val, ctl = BMCR_LOOPBACK;
int ret;
u16 ctl = BMCR_LOOPBACK;
int ret, val;

ctl |= mii_bmcr_encode_fixed(phydev->speed, phydev->duplex);

Expand Down

0 comments on commit 32fa436

Please sign in to comment.