Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Oleksandr Natalenko <oleksandr@natalenko.name>
To:     syzbot <syzbot+9b57a46bf1801ce2a2ca@syzkaller.appspotmail.com>,
        Alan Stern <stern@rowland.harvard.edu>
Cc:     benjamin.tissoires@redhat.com, jikos@kernel.org,
        linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-usb@vger.kernel.org, mkubecek@suse.cz,
        syzkaller-bugs@googlegroups.com
Subject: Re: [syzbot] WARNING in hid_submit_ctrl/usb_submit_urb
Date:   Mon, 30 Aug 2021 21:22:39 +0200
Message-ID: <2760703.iRigd37PT7@natalenko.name>
In-Reply-To: <20210819195300.GA8613@rowland.harvard.edu>
References: <20210819152626.GD228422@rowland.harvard.edu> <00000000000009e24705c9ecf9b3@google.com> <20210819195300.GA8613@rowland.harvard.edu>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hello.

On =C4=8Dtvrtek 19. srpna 2021 21:53:00 CEST Alan Stern wrote:
> On Thu, Aug 19, 2021 at 10:35:11AM -0700, syzbot wrote:
> > Hello,
> >=20
> > syzbot has tested the proposed patch but the reproducer is still
> > triggering an issue: WARNING in hid_submit_ctrl/usb_submit_urb
> >=20
> > cm6533_jd 0003:0D8C:0022.0001: submit_ctrl: maxpacket 64 len 0 padlen 0
> > ------------[ cut here ]------------
> > usb 1-1: BOGUS control dir, pipe 80000280 doesn't match bRequestType a1
>=20
> Ah.   The padding code doesn't add anything if the length is
> already a multiple of the maxpacket value, and of course 0 is such
> a multiple.
>=20
> The following simplified variant of Michal's patch should fix the
> problem.
>=20
> Alan Stern
>=20
> #syz test:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> 794c7931a242
>=20
> Index: usb-devel/drivers/hid/usbhid/hid-core.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- usb-devel.orig/drivers/hid/usbhid/hid-core.c
> +++ usb-devel/drivers/hid/usbhid/hid-core.c
> @@ -377,27 +377,23 @@ static int hid_submit_ctrl(struct hid_de
>  	len =3D hid_report_len(report);
>  	if (dir =3D=3D USB_DIR_OUT) {
>  		usbhid->urbctrl->pipe =3D usb_sndctrlpipe(hid_to_usb_dev(hid),=20
0);
> -		usbhid->urbctrl->transfer_buffer_length =3D len;
>  		if (raw_report) {
>  			memcpy(usbhid->ctrlbuf, raw_report, len);
>  			kfree(raw_report);
>  			usbhid->ctrl[usbhid->ctrltail].raw_report =3D NULL;
>  		}
>  	} else {
> -		int maxpacket, padlen;
> +		int maxpacket;
>=20
>  		usbhid->urbctrl->pipe =3D usb_rcvctrlpipe(hid_to_usb_dev(hid),=20
0);
>  		maxpacket =3D usb_maxpacket(hid_to_usb_dev(hid),
>  					  usbhid->urbctrl->pipe, 0);
> -		if (maxpacket > 0) {
> -			padlen =3D DIV_ROUND_UP(len, maxpacket);
> -			padlen *=3D maxpacket;
> -			if (padlen > usbhid->bufsize)
> -				padlen =3D usbhid->bufsize;
> -		} else
> -			padlen =3D 0;
> -		usbhid->urbctrl->transfer_buffer_length =3D padlen;
> +		len +=3D (len =3D=3D 0);	/* Don't allow 0-length reports */
> +		len =3D round_up(len, maxpacket);
> +		if (len > usbhid->bufsize)
> +			len =3D usbhid->bufsize;
>  	}
> +	usbhid->urbctrl->transfer_buffer_length =3D len;
>  	usbhid->urbctrl->dev =3D hid_to_usb_dev(hid);
>=20
>  	usbhid->cr->bRequestType =3D USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;

I've tried both Michal's patch as well as this one, and both work for me,=20
hence feel free to add this:

Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>

once the fix is submitted.

Thanks!

=2D-=20
Oleksandr Natalenko (post-factum)