From: Sasha Levin <sashal@kernel•org>
To: linux-kernel@vger•kernel.org, stable@vger•kernel.org
Cc: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech•se>,
"Florian Fainelli" <florian.fainelli@broadcom•com>,
"Andrew Lunn" <andrew@lunn•ch>,
"Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas•com>,
"Geert Uytterhoeven" <geert+renesas@glider•be>,
"Jakub Kicinski" <kuba@kernel•org>,
"Sasha Levin" <sashal@kernel•org>,
hkallweit1@gmail•com, davem@davemloft•net, edumazet@google•com,
pabeni@redhat•com, netdev@vger•kernel.org
Subject: [PATCH AUTOSEL 6.11 075/244] net: phy: Check for read errors in SIOCGMIIREG
Date: Wed, 25 Sep 2024 07:24:56 -0400 [thread overview]
Message-ID: <20240925113641.1297102-75-sashal@kernel.org> (raw)
In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org>
From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech•se>
[ Upstream commit 569bf6d481b0b823c3c9c3b8be77908fd7caf66b ]
When reading registers from the PHY using the SIOCGMIIREG IOCTL any
errors returned from either mdiobus_read() or mdiobus_c45_read() are
ignored, and parts of the returned error is passed as the register value
back to user-space.
For example, if mdiobus_c45_read() is used with a bus that do not
implement the read_c45() callback -EOPNOTSUPP is returned. This is
however directly stored in mii_data->val_out and returned as the
registers content. As val_out is a u16 the error code is truncated and
returned as a plausible register value.
Fix this by first checking the return value for errors before returning
it as the register content.
Before this patch,
# phytool read eth0/0:1/0
0xffa1
After this change,
$ phytool read eth0/0:1/0
error: phy_read (-95)
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech•se>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom•com>
Reviewed-by: Andrew Lunn <andrew@lunn•ch>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider•be>
Link: https://patch.msgid.link/20240903171536.628930-1-niklas.soderlund+renesas@ragnatech.se
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
drivers/net/phy/phy.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 785182fa5fe01..b88d857ea23b8 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -342,14 +342,19 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)
if (mdio_phy_id_is_c45(mii_data->phy_id)) {
prtad = mdio_phy_id_prtad(mii_data->phy_id);
devad = mdio_phy_id_devad(mii_data->phy_id);
- mii_data->val_out = mdiobus_c45_read(
- phydev->mdio.bus, prtad, devad,
- mii_data->reg_num);
+ ret = mdiobus_c45_read(phydev->mdio.bus, prtad, devad,
+ mii_data->reg_num);
+
} else {
- mii_data->val_out = mdiobus_read(
- phydev->mdio.bus, mii_data->phy_id,
- mii_data->reg_num);
+ ret = mdiobus_read(phydev->mdio.bus, mii_data->phy_id,
+ mii_data->reg_num);
}
+
+ if (ret < 0)
+ return ret;
+
+ mii_data->val_out = ret;
+
return 0;
case SIOCSMIIREG:
--
2.43.0
next prev parent reply other threads:[~2024-09-25 11:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-25 11:23 [PATCH AUTOSEL 6.11 001/244] l2tp: prevent possible tunnel refcount underflow Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 009/244] ice: Adjust over allocation of memory in ice_sched_add_root_node() and ice_sched_add_node() Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 012/244] wifi: cfg80211: Set correct chandef when starting CAC Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 013/244] net/xen-netback: prevent UAF in xenvif_flush_hash() Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 014/244] net: hisilicon: hip04: fix OF node leak in probe() Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 015/244] net: hisilicon: hns_dsaf_mac: fix OF node leak in hns_mac_get_info() Sasha Levin
2024-09-25 11:23 ` [PATCH AUTOSEL 6.11 016/244] net: hisilicon: hns_mdio: fix OF node leak in probe() Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 022/244] e1000e: avoid failing the system during pm_suspend Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 025/244] net: sched: consistently use rcu_replace_pointer() in taprio_change() Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 036/244] l2tp: don't use tunnel socket sk_user_data in ppp procfs output Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 037/244] l2tp: free sessions using rcu Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 038/244] l2tp: use rcu list add/del when updating lists Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 042/244] tipc: guard against string buffer overrun Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 043/244] net: skbuff: sprinkle more __GFP_NOWARN on ingress allocs Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 044/244] net: mvpp2: Increase size of queue_name buffer Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 045/244] bnxt_en: Extend maximum length of version string by 1 byte Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 046/244] ipv4: Check !in_dev earlier for ioctl(SIOCSIFADDR) Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 048/244] netfilter: nf_tables: do not remove elements if set backend implements .abort Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 049/244] netfilter: nf_tables: don't initialize registers in nft_do_chain() Sasha Levin
2024-09-25 11:58 ` Pablo Neira Ayuso
2024-09-25 12:17 ` Pablo Neira Ayuso
2024-09-25 12:20 ` Florian Westphal
2024-10-06 0:28 ` Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 050/244] ipv4: Mask upper DSCP bits and ECN bits in NETLINK_FIB_LOOKUP family Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 054/244] net: atlantic: Avoid warning about potential string truncation Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 056/244] netpoll: Ensure clean state on setup failures Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 057/244] tcp: avoid reusing FIN_WAIT2 when trying to find port in connect() process Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 062/244] wifi: mac80211: fix RCU list iterations Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 068/244] can: netlink: avoid call to do_set_data_bittiming callback with stale can_priv::ctrlmode Sasha Levin
2024-09-25 11:24 ` [PATCH AUTOSEL 6.11 069/244] netdev-genl: Set extack and fix error on napi-get Sasha Levin
2024-09-25 11:24 ` Sasha Levin [this message]
2024-09-25 11:25 ` [PATCH AUTOSEL 6.11 079/244] net: napi: Prevent overflow of napi_defer_hard_irqs Sasha Levin
2024-09-25 11:25 ` [PATCH AUTOSEL 6.11 084/244] net: tls: wait for async completion on last message Sasha Levin
2024-09-25 11:25 ` [PATCH AUTOSEL 6.11 087/244] nfp: Use IRQF_NO_AUTOEN flag in request_irq() Sasha Levin
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=20240925113641.1297102-75-sashal@kernel.org \
--to=sashal@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=florian.fainelli@broadcom$(echo .)com \
--cc=geert+renesas@glider$(echo .)be \
--cc=hkallweit1@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=niklas.soderlund+renesas@ragnatech$(echo .)se \
--cc=pabeni@redhat$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=yoshihiro.shimoda.uh@renesas$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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