From: Greg KH <gregkh@linuxfoundation•org>
To: Pavel Skripkin <paskripkin@gmail•com>
Cc: davem@davemloft•net, kuba@kernel•org, tanghui20@huawei•com,
andrew@lunn•ch, oneukum@suse•com, arnd@arndb•de,
linux-usb@vger•kernel.org, netdev@vger•kernel.org,
linux-kernel@vger•kernel.org,
syzbot+003c0a286b9af5412510@syzkaller•appspotmail.com
Subject: Re: [PATCH] net: mcs7830: handle usb read errors properly
Date: Fri, 7 Jan 2022 11:06:49 +0100 [thread overview]
Message-ID: <YdgQuavHA/T8tlHi@kroah.com> (raw)
In-Reply-To: <20220106225716.7425-1-paskripkin@gmail.com>
On Fri, Jan 07, 2022 at 01:57:16AM +0300, Pavel Skripkin wrote:
> Syzbot reported uninit value in mcs7830_bind(). The problem was in
> missing validation check for bytes read via usbnet_read_cmd().
>
> usbnet_read_cmd() internally calls usb_control_msg(), that returns
> number of bytes read. Code should validate that requested number of bytes
> was actually read.
>
> So, this patch adds missing size validation check inside
> mcs7830_get_reg() to prevent uninit value bugs
>
> CC: Arnd Bergmann <arnd@arndb•de>
> Reported-and-tested-by: syzbot+003c0a286b9af5412510@syzkaller•appspotmail.com
> Fixes: 2a36d7083438 ("USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter")
> Signed-off-by: Pavel Skripkin <paskripkin@gmail•com>
> ---
>
> @Arnd, I am not sure about mcs7830_get_rev() function.
>
> Is get_reg(22, 2) == 1 valid read? If so, I think, we should call
> usbnet_read_cmd() directly here, since other callers care only about
> negative error values.
>
> Thanks
>
>
> ---
> drivers/net/usb/mcs7830.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
> index 326cc4e749d8..fdda0616704e 100644
> --- a/drivers/net/usb/mcs7830.c
> +++ b/drivers/net/usb/mcs7830.c
> @@ -108,8 +108,16 @@ static const char driver_name[] = "MOSCHIP usb-ethernet driver";
>
> static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
> {
> - return usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ,
> - 0x0000, index, data, size);
> + int ret;
> +
> + ret = usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ,
> + 0x0000, index, data, size);
> + if (ret < 0)
> + return ret;
> + else if (ret < size)
> + return -ENODATA;
We have a usb core function that handles these "short reads are an
error" issue. Perhaps usbnet_read_cmd() should be converted to use it
instead?
thanks,
greg k-h
next prev parent reply other threads:[~2022-01-07 10:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-06 22:57 [PATCH] net: mcs7830: handle usb read errors properly Pavel Skripkin
2022-01-07 2:31 ` Arnd Bergmann
2022-01-07 10:06 ` Greg KH [this message]
2022-01-07 10:18 ` Pavel Skripkin
2022-01-10 1:00 ` patchwork-bot+netdevbpf
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=YdgQuavHA/T8tlHi@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=oneukum@suse$(echo .)com \
--cc=paskripkin@gmail$(echo .)com \
--cc=syzbot+003c0a286b9af5412510@syzkaller$(echo .)appspotmail.com \
--cc=tanghui20@huawei$(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