From: Dan Carpenter <dan.carpenter@oracle.com>
To: David Kahurani <k.kahurani@gmail.com>
Cc: netdev@vger.kernel.org,
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, paskripkin@gmail.com
Subject: Re: [PATCH] net: ax88179: add proper error handling of usb read errors
Date: Mon, 4 Apr 2022 18:31:51 +0300 [thread overview]
Message-ID: <20220404153151.GF3293@kadam> (raw)
In-Reply-To: <20220404151036.265901-1-k.kahurani@gmail.com>
> diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
> index e2fa56b92..b5e114bed 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},
> };
>
> -static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
> - 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,9 +202,12 @@ static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
> ret = fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> value, index, data, size);
>
> - if (unlikely(ret < 0))
> + if (unlikely(ret < size)) {
> + ret = ret < 0 ? ret : -ENODATA;
> +
> netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n",
> index, ret);
> + }
>
> return ret;
It would be better to make __ax88179_read_cmd() return 0 on success
instead of returning size on success. Non-standard returns lead to bugs.
> @@ -1060,16 +1151,30 @@ static int ax88179_check_eeprom(struct usbnet *dev)
>
> jtimeout = jiffies + delay;
> do {
> - ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
> - 1, 1, &buf);
> + ret = ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
> + 1, 1, &buf);
> +
> + if (ret < 0) {
> + netdev_dbg(dev->net,
> + "Failed to read SROM_CMD: %d\n",
> + ret);
> + return ret;
> + }
>
> if (time_after(jiffies, jtimeout))
> return -EINVAL;
The indenting here is wrong. Run scripts/checkpatch.pl on your patches.
regards,
dan carpenter
next prev parent reply other threads:[~2022-04-04 15:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 15:10 [PATCH] net: ax88179: add proper error handling of usb read errors David Kahurani
2022-04-04 15:31 ` Dan Carpenter [this message]
2022-04-13 12:36 ` David Kahurani
2022-04-13 15:32 ` Dan Carpenter
2022-04-14 7:31 ` Oliver Neukum
2022-04-14 8:21 ` Dan Carpenter
2022-04-14 9:13 ` Oliver Neukum
2022-04-04 16:50 ` Pavel Skripkin
2022-04-11 15:11 ` Andy Shevchenko
2022-04-05 9:44 ` Paolo Abeni
2022-04-05 20:44 ` kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2022-04-16 7:48 David Kahurani
2022-04-16 11:05 ` Pavel Skripkin
2022-04-16 11:10 ` Pavel Skripkin
2022-04-16 11:49 ` David Kahurani
2022-04-16 11:53 ` Pavel Skripkin
2022-04-16 11:57 ` Pavel Skripkin
2022-04-19 13:41 ` Paolo Abeni
2022-05-14 13:32 David Kahurani
2022-05-14 16:51 ` Pavel Skripkin
2022-05-14 18:54 ` Dan Carpenter
2022-05-14 18:57 ` Pavel Skripkin
2022-05-16 19:31 ` Jakub Kicinski
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=20220404153151.GF3293@kadam \
--to=dan.carpenter@oracle.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jgg@ziepe.ca \
--cc=k.kahurani@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=syzbot+d3dbdf31fbe9d8f5f311@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).