From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com ([192.55.52.43]:31691 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862AbdKJKk4 (ORCPT ); Fri, 10 Nov 2017 05:40:56 -0500 From: Felipe Balbi To: John Keeping Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Vincent Pelletier , Jim Lin , Janusz Dziedzic , John Keeping , stable@vger.kernel.org Subject: Re: [PATCH] usb: f_fs: Drop check on Reserved1 field on OS_DESC_EXT_COMPAT In-Reply-To: <20171109163429.8697-1-john@metanate.com> References: <20171109163429.8697-1-john@metanate.com> Date: Fri, 10 Nov 2017 12:40:39 +0200 Message-ID: <874lq2zaag.fsf@linux.intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Sender: stable-owner@vger.kernel.org List-ID: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, John Keeping writes: > This check has gone through several incompatible variations in commits > 53642399aa71 ("usb: gadget: f_fs: Fix wrong check on reserved1 of > OS_DESC_EXT_COMPAT"), 354bc45bf329 ("usb: gadget: f_fs: Fix ExtCompat > descriptor validation") and 3ba534df815f ("Revert "usb: gadget: f_fs: > Fix ExtCompat descriptor validation"") after initially being introduced > in commit f0175ab51993 ("usb: gadget: f_fs: OS descriptors support"). > > The various changes make it impossible for a single userspace > implementation to work with different kernel versions, so let's just > drop the condition to avoid breaking userspace. > > Fixes: 53642399aa71 ("usb: gadget: f_fs: Fix wrong check on reserved1 of = OS_DESC_EXT_COMPAT") > Cc: stable@vger.kernel.org # v4.7+ > Signed-off-by: John Keeping > --- > drivers/usb/gadget/function/f_fs.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/func= tion/f_fs.c > index 652397eda6d6..0d9962834345 100644 > --- a/drivers/usb/gadget/function/f_fs.c > +++ b/drivers/usb/gadget/function/f_fs.c > @@ -2282,8 +2282,7 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_t= ype type, > int i; >=20=20 > if (len < sizeof(*d) || > - d->bFirstInterfaceNumber >=3D ffs->interfaces_count || > - !d->Reserved1) > + d->bFirstInterfaceNumber >=3D ffs->interfaces_count) > return -EINVAL; > for (i =3D 0; i < ARRAY_SIZE(d->Reserved2); ++i) > if (d->Reserved2[i]) Sorry, but no. We want to be compliant with the specification. If there are older still-maintained stable trees which are not working, we need to backport a fix to them, but we're not allowing uncompliant implementations. =2D-=20 balbi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEElLzh7wn96CXwjh2IzL64meEamQYFAloFgikACgkQzL64meEa mQaWHA//cLr7EFzHN4tVAyMeATN78bzq6k3pOAw4WB/WmDYDrLvUaFV815VoDLpu jMwvMG7jTnxXBkHAtUZa7lsiaWYKgq60Y78gZfkescagvxnhmzaNhLyYKla9z++D y3PRB8mwIVcyTrd3+yor7D1+zJYHlD0ZUvo3sKA5IQm46RWZzUH+G6ufWWzkG+a4 XCcz0UnCfk1cfLXTr54BqVNF3U9dAUnNtpsFiPr/+rz5dG8OQfBQyQQrKldDWlZX jZrdiNNo2nbzVMOdaJdRa0BA7z5CpJeit+xC/JZkBYEHd5DyIe2v/CrOCnFvg988 cs9y4HLoDjc/oTisED3c/uL4Wan2YwHrtJ/1yS0wMV0YESLXZtUnPaf8w6BtehoC 8/jbU3+y6UFhhsKjj4pMkBh8MZD2u1fuNVp/G7W86Ti0Fo3gDwZLi8W//YorwZVb MLvqS5gflifzlwA5K1dzIIYJjXu/qIeI2nkV4K8UowKhjuDTNJZ0SBYBXq+UxlWD qe+m089QSz4l6Ia2a5Yi2JdQS3bLVa6T/ESfo8ZNOpx92j/Te9+D7aTRtuxQUg/b Uvlj6Jm4qcbkv5jW0HtTGk4xgsW5WItQOK2D5OTr0v3z56io85guywe8u77YJ/V7 tLUhmSSKdmZVGrmEmfGRS8pqrxrDVwWb5RDNU6MxQZJrXrZvteA= =krYP -----END PGP SIGNATURE----- --=-=-=--