diff options
| author | Pavel Skripkin <paskripkin@gmail.com> | 2022-02-06 19:05:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-07 13:28:36 +0100 |
| commit | 920a9fa27e7805499cfe78491b36fed2322c02ec (patch) | |
| tree | 489a32cf147146a9e7853cba58300753b75fbf72 /drivers/net/usb/asix.h | |
| parent | r8169: factor out redundant RTL8168d PHY config functionality to rtl8168d_1_c... (diff) | |
| download | linux-920a9fa27e7805499cfe78491b36fed2322c02ec.tar.xz linux-920a9fa27e7805499cfe78491b36fed2322c02ec.zip | |
net: asix: add proper error handling of usb read errors
Syzbot once again hit uninit value in asix driver. The problem still the
same -- asix_read_cmd() reads less bytes, than was requested by caller.
Since all read requests are performed via asix_read_cmd() let's catch
usb related error there and add __must_check notation to be sure all
callers actually check return value.
So, this patch adds sanity check inside asix_read_cmd(), that simply
checks if bytes read are not less, than was requested and adds missing
error handling of asix_read_cmd() all across the driver code.
Fixes: d9fe64e51114 ("net: asix: Add in_pm parameter")
Reported-and-tested-by: syzbot+6ca9f7867b77c2d316ac@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/asix.h')
| -rw-r--r-- | drivers/net/usb/asix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/asix.h b/drivers/net/usb/asix.h index 2a1e31defe71..4334aafab59a 100644 --- a/drivers/net/usb/asix.h +++ b/drivers/net/usb/asix.h @@ -192,8 +192,8 @@ extern const struct driver_info ax88172a_info; /* ASIX specific flags */ #define FLAG_EEPROM_MAC (1UL << 0) /* init device MAC from eeprom */ -int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, - u16 size, void *data, int in_pm); +int __must_check asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, + u16 size, void *data, int in_pm); int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16 size, void *data, int in_pm); |