From nobody Thu Apr 25 15:56:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 666AEC433FE for ; Sat, 14 May 2022 13:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232608AbiENNcy (ORCPT ); Sat, 14 May 2022 09:32:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232564AbiENNcv (ORCPT ); Sat, 14 May 2022 09:32:51 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C3CB2252B; Sat, 14 May 2022 06:32:49 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 125-20020a1c1983000000b003941f354c62so6145545wmz.0; Sat, 14 May 2022 06:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qPn0AyXrv0mkB3H4MxGJoFOey3zOFFGmiul7y7OB4dk=; b=awzUXjFGs+oGT7IvDM/mVCHWq+XL9cFdAlkvU8g9CXeRO84LYlelEJHpyu6Y6W8QAy SOfzrhkXStfTOGjBVrmcmJsyhKil585piVNBDgMlkDPtFZ1DpmjOHUehBQAtftR4gdA0 cwBWew22N7bGcJZcwC4UK1Eaj/ehN1OEIBB4TNyRup5nNyLsVok7kmjUPpdBYtZGuLrN sdm62/pX3fsEZ0ER3rC4wvH5ZR3nf4ygWuScxlcLiEXQFKXl96ke/C6ysF/46N6j+XG0 8WweOiKaERlRLVjZp2nxDKo8SrHY2mY0zuw+aZzpaLIIGpjaYF0pSe08nG7c/lfXOuPx YgUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qPn0AyXrv0mkB3H4MxGJoFOey3zOFFGmiul7y7OB4dk=; b=dSDP2hyYmpA8745ESmjb0FvSnGPqvVSJU+2yJCh8i5bm6EHiBQjuyWS8I2M0X9oYWM A2kiO8uvUKfIaHt5Ow/R+qKdBAV5RT+Y/k3kc7yM/Odlk7s0K+ihDugmoOLAdBbZ0qWc D2Fpp6LY+EtPAlr9NApqczhruZZaPAyvcHzHPWk7ZloWPYOD+/2O/ftCYkHRz1CdR3aV 3+x7cxnmkqiBoHJEO/33OKMceFO9AJ7AEYRSHk7fa8fw24fMVW2KR3tkNxq3ZP82ZZaU yoDPyEAOE/32JUo1Y5nvKjG305n1gmQXXjgaRvaE9v2GWpZEw99IeXiCVXDBkvqYKjVS lbbQ== X-Gm-Message-State: AOAM531NpyfhVD1MTN8WdpQl00Z/QDndl9DplTa5yy12prGCdjOPQgOR OS1BukeKF3tN+p2QT+cBB4rkSFmtf9S0zA== X-Google-Smtp-Source: ABdhPJxA0Mt8ibeJbbpIbUDzqUXBgPZp8CWMjugkXJZBZFHOfO7fXePHZmUz/nbdW1cEoUOYnj32RQ== X-Received: by 2002:a7b:cbc2:0:b0:388:faec:2036 with SMTP id n2-20020a7bcbc2000000b00388faec2036mr9200621wmi.190.1652535167478; Sat, 14 May 2022 06:32:47 -0700 (PDT) Received: from localhost.localdomain ([197.156.190.247]) by smtp.gmail.com with ESMTPSA id e14-20020a05600c4e4e00b003942a244f3asm8255028wmq.19.2022.05.14.06.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 06:32:47 -0700 (PDT) From: David Kahurani To: netdev@vger.kernel.org Cc: syzbot+d3dbdf31fbe9d8f5f311@syzkaller.appspotmail.com, davem@davemloft.net, jgg@ziepe.ca, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, phil@philpotter.co.uk, syzkaller-bugs@googlegroups.com, arnd@arndb.de, dan.carpenter@oracle.com, David Kahurani Subject: [PATCH] net: ax88179: add proper error handling of usb read errors Date: Sat, 14 May 2022 16:32:34 +0300 Message-Id: <20220514133234.33796-1-k.kahurani@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Reads that are lesser than the requested size lead to uninit-value bugs. In this particular case a variable which was supposed to be initialized after a read is left uninitialized after a partial read. Qualify such reads as errors and handle them correctly and while at it convert the reader functions to return zero on success for easier error handling. Fixes: e2ca90c276e1 ("ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabi= t ethernet adapter driver") Signed-off-by: David Kahurani Reported-and-tested-by: syzbot+d3dbdf31fbe9d8f5f311@syzkaller.appspotmail.c= om Reviewed-by: Pavel Skripkin --- drivers/net/usb/ax88179_178a.c | 281 ++++++++++++++++++++++++++------- 1 file changed, 227 insertions(+), 54 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index e2fa56b92..ae6fa10ff 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -185,8 +185,9 @@ static const struct { {7, 0xcc, 0x4c, 0x18, 8}, }; =20 -static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 i= ndex, - u16 size, void *data, int in_pm) +static int __must_check __ax88179_read_cmd(struct usbnet *dev, u8 cmd, + u16 value, u16 index, u16 size, + void *data, int in_pm) { int ret; int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16); @@ -201,11 +202,15 @@ static int __ax88179_read_cmd(struct usbnet *dev, u8 = cmd, u16 value, u16 index, ret =3D fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value, index, data, size); =20 - if (unlikely(ret < 0)) + if (unlikely(ret < size)) { + ret =3D ret < 0 ? ret : -ENODATA; + netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n", index, ret); + return ret; + } =20 - return ret; + return 0; } =20 static int __ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 = index, @@ -249,26 +254,33 @@ static void ax88179_write_cmd_async(struct usbnet *de= v, u8 cmd, u16 value, } } =20 -static int ax88179_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, - u16 index, u16 size, void *data) +static int __must_check ax88179_read_cmd_nopm(struct usbnet *dev, u8 cmd, + u16 value, u16 index, u16 size, + void *data) { int ret; =20 if (2 =3D=3D size) { u16 buf; ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1); + if (ret) + return ret; le16_to_cpus(&buf); *((u16 *)data) =3D buf; } else if (4 =3D=3D size) { u32 buf; ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1); + if (ret) + return ret; le32_to_cpus(&buf); *((u32 *)data) =3D buf; } else { ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, data, 1); + if (ret) + return ret; } =20 - return ret; + return 0; } =20 static int ax88179_write_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, @@ -290,26 +302,32 @@ static int ax88179_write_cmd_nopm(struct usbnet *dev,= u8 cmd, u16 value, return ret; } =20 -static int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 ind= ex, - u16 size, void *data) +static int __must_check ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 v= alue, + u16 index, u16 size, void *data) { int ret; =20 if (2 =3D=3D size) { u16 buf =3D 0; ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0); + if (ret) + return ret; le16_to_cpus(&buf); *((u16 *)data) =3D buf; } else if (4 =3D=3D size) { u32 buf =3D 0; ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0); + if (ret) + return ret; le32_to_cpus(&buf); *((u32 *)data) =3D buf; } else { ret =3D __ax88179_read_cmd(dev, cmd, value, index, size, data, 0); + if (ret) + return ret; } =20 - return ret; + return 0; } =20 static int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 in= dex, @@ -354,8 +372,15 @@ static int ax88179_mdio_read(struct net_device *netdev= , int phy_id, int loc) { struct usbnet *dev =3D netdev_priv(netdev); u16 res; + int ret; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); + + if (ret) { + netdev_dbg(dev->net, "Failed to read PHY_ID: %d\n", ret); + return ret; + } =20 - ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res); return res; } =20 @@ -427,19 +452,31 @@ static int ax88179_suspend(struct usb_interface *intf= , pm_message_t message) struct usbnet *dev =3D usb_get_intfdata(intf); u16 tmp16; u8 tmp8; + int ret; =20 usbnet_suspend(intf, message); =20 /* Disable RX path */ - ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); + ret =3D ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + + if (ret) { + netdev_dbg(dev->net, "Failed to read MEDIUM_STATUS_MODE: %d\n", + ret); + return ret; + } + tmp16 &=3D ~AX_MEDIUM_RECEIVE_EN; ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp16); =20 /* Force bulk-in zero length */ - ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, - 2, 2, &tmp16); + ret =3D ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, + 2, 2, &tmp16); + if (ret) { + netdev_dbg(dev->net, "Failed to read PHYPWR_RSTCTL: %d\n", ret); + return ret; + } =20 tmp16 |=3D AX_PHYPWR_RSTCTL_BZ | AX_PHYPWR_RSTCTL_IPRL; ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, @@ -462,6 +499,7 @@ static int ax88179_auto_detach(struct usbnet *dev, int = in_pm) { u16 tmp16; u8 tmp8; + int ret; int (*fnr)(struct usbnet *, u8, u16, u16, u16, void *); int (*fnw)(struct usbnet *, u8, u16, u16, u16, const void *); =20 @@ -481,11 +519,19 @@ static int ax88179_auto_detach(struct usbnet *dev, in= t in_pm) =20 /* Enable Auto Detach bit */ tmp8 =3D 0; - fnr(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8); + ret =3D fnr(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8); + if (ret) { + netdev_dbg(dev->net, "Failed to read CLK_SELECT: %d", ret); + return ret; + } tmp8 |=3D AX_CLK_SELECT_ULR; fnw(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8); =20 - fnr(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16); + ret =3D fnr(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16); + if (ret) { + netdev_dbg(dev->net, "Failed to read PHYPWR_RSTCTL: %d", ret); + return ret; + } tmp16 |=3D AX_PHYPWR_RSTCTL_AT; fnw(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16); =20 @@ -497,6 +543,7 @@ static int ax88179_resume(struct usb_interface *intf) struct usbnet *dev =3D usb_get_intfdata(intf); u16 tmp16; u8 tmp8; + int ret; =20 usbnet_link_change(dev, 0, 0); =20 @@ -515,7 +562,14 @@ static int ax88179_resume(struct usb_interface *intf) ax88179_auto_detach(dev, 1); =20 /* Enable clock */ - ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8); + ret =3D ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &= tmp8); + + if (ret) { + netdev_dbg(dev->net, "Failed to read CLK_SELECT %d\n", ret); + + return ret; + } + tmp8 |=3D AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS; ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8); msleep(100); @@ -601,7 +655,7 @@ ax88179_get_eeprom(struct net_device *net, struct ethto= ol_eeprom *eeprom, ret =3D __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2, &eeprom_buff[i - first_word], 0); - if (ret < 0) { + if (ret) { kfree(eeprom_buff); return -EIO; } @@ -645,7 +699,7 @@ ax88179_set_eeprom(struct net_device *net, struct ethto= ol_eeprom *eeprom, if (eeprom->offset & 1) { ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, first_word, 1, 2, &eeprom_buff[0]); - if (ret < 0) { + if (ret) { netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word= ); goto free; } @@ -654,7 +708,7 @@ ax88179_set_eeprom(struct net_device *net, struct ethto= ol_eeprom *eeprom, if ((eeprom->offset + eeprom->len) & 1) { ret =3D ax88179_read_cmd(dev, AX_ACCESS_EEPROM, last_word, 1, 2, &eeprom_buff[last_word - first_word]); - if (ret < 0) { + if (ret) { netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word); goto free; } @@ -951,23 +1005,45 @@ static int ax88179_set_features(struct net_device *net, netdev_features_t features) { u8 tmp; + int ret; struct usbnet *dev =3D netdev_priv(net); netdev_features_t changed =3D net->features ^ features; =20 if (changed & NETIF_F_IP_CSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, + 1, 1, &tmp); + if (ret) { + netdev_dbg(dev->net, "Failed to read TXCOE_CTL: %d\n", + ret); + return ret; + } + tmp ^=3D AX_TXCOE_TCP | AX_TXCOE_UDP; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); } =20 if (changed & NETIF_F_IPV6_CSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, + 1, 1, &tmp); + if (ret) { + netdev_dbg(dev->net, "Failed to read TXCOE_CTL: %d\n", + ret); + return ret; + } + tmp ^=3D AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp); } =20 if (changed & NETIF_F_RXCSUM) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, + 1, 1, &tmp); + if (ret) { + netdev_dbg(dev->net, "Failed to read TXCOE_CTL: %d\n", + ret); + return ret; + } + tmp ^=3D AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp); @@ -980,19 +1056,36 @@ static int ax88179_change_mtu(struct net_device *net= , int new_mtu) { struct usbnet *dev =3D netdev_priv(net); u16 tmp16; + int ret; =20 net->mtu =3D new_mtu; dev->hard_mtu =3D net->mtu + net->hard_header_len; =20 if (net->mtu > 1500) { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, + AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + if (ret) { + netdev_dbg(dev->net, + "Failed to read MEDIUM_STATUS_MODE %d\n", + ret); + return ret; + } + tmp16 |=3D AX_MEDIUM_JUMBO_EN; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp16); } else { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, + AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + if (ret) { + netdev_dbg(dev->net, + "Failed to read MEDIUM_STATUS_MODE %d\n", + ret); + return ret; + } + tmp16 &=3D ~AX_MEDIUM_JUMBO_EN; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp16); @@ -1045,6 +1138,7 @@ static int ax88179_check_eeprom(struct usbnet *dev) u8 i, buf, eeprom[20]; u16 csum, delay =3D HZ / 10; unsigned long jtimeout; + int ret; =20 /* Read EEPROM content */ for (i =3D 0; i < 6; i++) { @@ -1060,16 +1154,29 @@ static int ax88179_check_eeprom(struct usbnet *dev) =20 jtimeout =3D jiffies + delay; do { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD, - 1, 1, &buf); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD, + 1, 1, &buf); + if (ret) { + netdev_dbg(dev->net, + "Failed to read SROM_CMD: %d\n", + ret); + return ret; + } =20 if (time_after(jiffies, jtimeout)) return -EINVAL; =20 } while (buf & EEP_BUSY); =20 - __ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW, - 2, 2, &eeprom[i * 2], 0); + ret =3D __ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW, + 2, 2, &eeprom[i * 2], 0); + + if (ret) { + netdev_dbg(dev->net, + "Failed to read SROM_DATA_LOW: %d\n", + ret); + return ret; + } =20 if ((i =3D=3D 0) && (eeprom[0] =3D=3D 0xFF)) return -EINVAL; @@ -1149,12 +1256,20 @@ static int ax88179_convert_old_led(struct usbnet *d= ev, u16 *ledvalue) =20 static int ax88179_led_setting(struct usbnet *dev) { + int ret; u8 ledfd, value =3D 0; u16 tmp, ledact, ledlink, ledvalue =3D 0, delay =3D HZ / 10; unsigned long jtimeout; =20 /* Check AX88179 version. UA1 or UA2*/ - ax88179_read_cmd(dev, AX_ACCESS_MAC, GENERAL_STATUS, 1, 1, &value); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, GENERAL_STATUS, 1, 1, + &value); + + if (ret) { + netdev_dbg(dev->net, "Failed to read GENERAL_STATUS: %d\n", + ret); + return ret; + } =20 if (!(value & AX_SECLD)) { /* UA1 */ value =3D AX_GPIO_CTRL_GPIO3EN | AX_GPIO_CTRL_GPIO2EN | @@ -1178,20 +1293,39 @@ static int ax88179_led_setting(struct usbnet *dev) =20 jtimeout =3D jiffies + delay; do { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD, - 1, 1, &value); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD, + 1, 1, &value); + if (ret) { + netdev_dbg(dev->net, + "Failed to read SROM_CMD: %d\n", + ret); + return ret; + } =20 if (time_after(jiffies, jtimeout)) return -EINVAL; =20 } while (value & EEP_BUSY); =20 - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_HIGH, - 1, 1, &value); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_HIGH, + 1, 1, &value); + if (ret) { + netdev_dbg(dev->net, "Failed to read SROM_DATA_HIGH: %d\n", + ret); + return ret; + } + ledvalue =3D (value << 8); =20 - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW, - 1, 1, &value); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW, + 1, 1, &value); + + if (ret) { + netdev_dbg(dev->net, "Failed to read SROM_DATA_LOW: %d", + ret); + return ret; + } + ledvalue |=3D value; =20 /* load internal ROM for defaule setting */ @@ -1213,11 +1347,21 @@ static int ax88179_led_setting(struct usbnet *dev) ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, GMII_PHYPAGE, 2, &tmp); =20 - ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, - GMII_LED_ACT, 2, &ledact); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, + GMII_LED_ACT, 2, &ledact); =20 - ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, - GMII_LED_LINK, 2, &ledlink); + if (ret) { + netdev_dbg(dev->net, "Failed to read PHY_ID: %d", ret); + return ret; + } + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, + GMII_LED_LINK, 2, &ledlink); + + if (ret) { + netdev_dbg(dev->net, "Failed to read PHY_ID: %d", ret); + return ret; + } =20 ledact &=3D GMII_LED_ACTIVE_MASK; ledlink &=3D GMII_LED_LINK_MASK; @@ -1295,6 +1439,7 @@ static int ax88179_led_setting(struct usbnet *dev) static void ax88179_get_mac_addr(struct usbnet *dev) { u8 mac[ETH_ALEN]; + int ret; =20 memset(mac, 0, sizeof(mac)); =20 @@ -1303,10 +1448,14 @@ static void ax88179_get_mac_addr(struct usbnet *dev) netif_dbg(dev, ifup, dev->net, "MAC address read from device tree"); } else { - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, - ETH_ALEN, mac); - netif_dbg(dev, ifup, dev->net, - "MAC address read from ASIX chip"); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, + ETH_ALEN, mac); + + if (ret) + netdev_dbg(dev->net, "Failed to read NODE_ID: %d", ret); + else + netif_dbg(dev, ifup, dev->net, + "MAC address read from ASIX chip"); } =20 if (is_valid_ether_addr(mac)) { @@ -1572,6 +1721,7 @@ static int ax88179_link_reset(struct usbnet *dev) u16 mode, tmp16, delay =3D HZ / 10; u32 tmp32 =3D 0x40000000; unsigned long jtimeout; + int ret; =20 jtimeout =3D jiffies + delay; while (tmp32 & 0x40000000) { @@ -1581,7 +1731,13 @@ static int ax88179_link_reset(struct usbnet *dev) &ax179_data->rxctl); =20 /*link up, check the usb device control TX FIFO full or empty*/ - ax88179_read_cmd(dev, 0x81, 0x8c, 0, 4, &tmp32); + ret =3D ax88179_read_cmd(dev, 0x81, 0x8c, 0, 4, &tmp32); + + if (ret) { + netdev_dbg(dev->net, "Failed to read TX FIFO: %d\n", + ret); + return ret; + } =20 if (time_after(jiffies, jtimeout)) return 0; @@ -1590,11 +1746,21 @@ static int ax88179_link_reset(struct usbnet *dev) mode =3D AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN | AX_MEDIUM_RXFLOW_CTRLEN; =20 - ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS, - 1, 1, &link_sts); + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS, + 1, 1, &link_sts); + + if (ret) { + netdev_dbg(dev->net, "Failed to read LINK_STATUS: %d", ret); + return ret; + } + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, + GMII_PHY_PHYSR, 2, &tmp16); =20 - ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, - GMII_PHY_PHYSR, 2, &tmp16); + if (ret) { + netdev_dbg(dev->net, "Failed to read PHY_ID: %d\n", ret); + return ret; + } =20 if (!(tmp16 & GMII_PHY_PHYSR_LINK)) { return 0; @@ -1732,9 +1898,16 @@ static int ax88179_reset(struct usbnet *dev) static int ax88179_stop(struct usbnet *dev) { u16 tmp16; + int ret; + + ret =3D ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, + 2, 2, &tmp16); + + if (ret) { + netdev_dbg(dev->net, "Failed to read STATUS_MODE: %d\n", ret); + return ret; + } =20 - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, - 2, 2, &tmp16); tmp16 &=3D ~AX_MEDIUM_RECEIVE_EN; ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, &tmp16); --=20 2.25.1