Commit 08f3a5c3 authored by Ma Ke's avatar Ma Ke Committed by David S. Miller

net: usb: sr9700: fix uninitialized variable use in sr_mdio_read

It could lead to error happen because the variable res is not updated if
the call to sr_share_read_word returns an error. In this particular case
error code was returned and res stayed uninitialized. Same issue also
applies to sr_read_reg.

This can be avoided by checking the return value of sr_share_read_word
and sr_read_reg, and propagating the error if the read operation failed.

Found by code review.

Cc: stable@vger.kernel.org
Fixes: c9b37458 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support")
Signed-off-by: default avatarMa Ke <make24@iscas.ac.cn>
Reviewed-by: default avatarShigeru Yoshida <syoshida@redhat.com>
Reviewed-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07c10cff
...@@ -179,6 +179,7 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc) ...@@ -179,6 +179,7 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc)
struct usbnet *dev = netdev_priv(netdev); struct usbnet *dev = netdev_priv(netdev);
__le16 res; __le16 res;
int rc = 0; int rc = 0;
int err;
if (phy_id) { if (phy_id) {
netdev_dbg(netdev, "Only internal phy supported\n"); netdev_dbg(netdev, "Only internal phy supported\n");
...@@ -189,11 +190,17 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc) ...@@ -189,11 +190,17 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc)
if (loc == MII_BMSR) { if (loc == MII_BMSR) {
u8 value; u8 value;
sr_read_reg(dev, SR_NSR, &value); err = sr_read_reg(dev, SR_NSR, &value);
if (err < 0)
return err;
if (value & NSR_LINKST) if (value & NSR_LINKST)
rc = 1; rc = 1;
} }
sr_share_read_word(dev, 1, loc, &res); err = sr_share_read_word(dev, 1, loc, &res);
if (err < 0)
return err;
if (rc == 1) if (rc == 1)
res = le16_to_cpu(res) | BMSR_LSTATUS; res = le16_to_cpu(res) | BMSR_LSTATUS;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment