From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: usb: gadget: f_fs: Process all descriptors during bind From: Jack Pham Message-Id: <20180124081153.32726-1-jackp@codeaurora.org> Date: Wed, 24 Jan 2018 00:11:53 -0800 To: Felipe Balbi , Michal Nazarewicz , Andrzej Pietrasiewicz Cc: Mayank Rana , linux-usb@vger.kernel.org, Jack Pham , stable@vger.kernel.org List-ID: RHVyaW5nIF9mZnNfZnVuY19iaW5kKCksIHRoZSByZWNlaXZlZCBkZXNjcmlwdG9ycyBhcmUgZXZh bHVhdGVkCnRvIHByZXBhcmUgZm9yIGJpbmRpbmcgd2l0aCB0aGUgZ2FkZ2V0IGluIG9yZGVyIHRv IGFsbG9jYXRlCmVuZHBvaW50cyBhbmQgb3B0aW9uYWxseSBzZXQgdXAgT1MgZGVzY3JpcHRvcnMu IEhvd2V2ZXIsIHRoZQpoaWdoLSBhbmQgc3VwZXItc3BlZWQgZGVzY3JpcHRvcnMgYXJlIG9ubHkg cGFyc2VkIGJhc2VkIG9uCndoZXRoZXIgdGhlIGdhZGdldF9pc19kdWFsc3BlZWQoKSBhbmQgZ2Fk Z2V0X2lzX3N1cGVyc3BlZWQoKQpjYWxscyBhcmUgdHJ1ZSwgcmVzcGVjdGl2ZWx5LgoKVGhpcyBp cyBhIHByb2JsZW0gaW4gY2FzZSBhIHVzZXJzcGFjZSBwcm9ncmFtIGFsd2F5cyBwcm92aWRlcwph bGwgb2YgdGhlIHtmdWxsLGhpZ2gsc3VwZXIsT1N9IGRlc2NyaXB0b3JzIHdoZW4gY29uZmlndXJp bmcgYQpmdW5jdGlvbi4gVGhlbiwgZm9yIGV4YW1wbGUgaWYgYSBnYWRnZXQgZGV2aWNlIGlzIG5v dCBjYXBhYmxlCm9mIFN1cGVyU3BlZWQsIHRoZSBjYWxsIHRvIGZmc19kb19kZXNjcygpIGZvciB0 aGUgU1MgZGVzY3JpcHRvcnMKaXMgc2tpcHBlZCwgcmVzdWx0aW5nIGluIGFuIGluY29ycmVjdCBv ZmZzZXQgY2FsY3VsYXRpb24gZm9yCnRoZSB2bGFfcHRyIHdoZW4gbW92aW5nIG9uIHRvIHRoZSBP UyBkZXNjcmlwdG9ycyB0aGF0IGZvbGxvdy4KVGhpcyBjYXVzZXMgZmZzX2RvX29zX2Rlc2NzKCkg dG8gZmFpbCBhcyBpdCBpcyBub3cgbG9va2luZyBhdAp0aGUgU1MgZGVzY3JpcHRvcnMnIG9mZnNl dCB3aXRoaW4gdGhlIHJhd19kZXNjcyBidWZmZXIgaW5zdGVhZC4KCl9mZnNfZnVuY19iaW5kKCkg c2hvdWxkIGV2YWx1YXRlIHRoZSBkZXNjcmlwdG9ycyB1bmNvbmRpdGlvbmFsbHksCnNvIHJlbW92 ZSB0aGUgY2hlY2tzIGZvciBnYWRnZXQgc3BlZWQuCgpGaXhlczogZjAxNzVhYjUxOTkzICgidXNi OiBnYWRnZXQ6IGZfZnM6IE9TIGRlc2NyaXB0b3JzIHN1cHBvcnQiKQpDYzogc3RhYmxlQHZnZXIu a2VybmVsLm9yZwpDby1EZXZlbG9wZWQtYnk6IE1heWFuayBSYW5hIDxtcmFuYUBjb2RlYXVyb3Jh Lm9yZz4KU2lnbmVkLW9mZi1ieTogTWF5YW5rIFJhbmEgPG1yYW5hQGNvZGVhdXJvcmEub3JnPgpT aWduZWQtb2ZmLWJ5OiBKYWNrIFBoYW0gPGphY2twQGNvZGVhdXJvcmEub3JnPgotLS0KIGRyaXZl cnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX2ZzLmMgfCA2ICsrLS0tLQogMSBmaWxlIGNoYW5nZWQs IDIgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3Vz Yi9nYWRnZXQvZnVuY3Rpb24vZl9mcy5jIGIvZHJpdmVycy91c2IvZ2FkZ2V0L2Z1bmN0aW9uL2Zf ZnMuYwppbmRleCBiNmNmNWFiLi41ZjJkYWZiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvZ2Fk Z2V0L2Z1bmN0aW9uL2ZfZnMuYworKysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vZl9m cy5jCkBAIC0yOTc2LDEwICsyOTc2LDggQEAgc3RhdGljIGludCBfZmZzX2Z1bmNfYmluZChzdHJ1 Y3QgdXNiX2NvbmZpZ3VyYXRpb24gKmMsCiAJc3RydWN0IGZmc19kYXRhICpmZnMgPSBmdW5jLT5m ZnM7CiAKIAljb25zdCBpbnQgZnVsbCA9ICEhZnVuYy0+ZmZzLT5mc19kZXNjc19jb3VudDsKLQlj b25zdCBpbnQgaGlnaCA9IGdhZGdldF9pc19kdWFsc3BlZWQoZnVuYy0+Z2FkZ2V0KSAmJgotCQlm dW5jLT5mZnMtPmhzX2Rlc2NzX2NvdW50OwotCWNvbnN0IGludCBzdXBlciA9IGdhZGdldF9pc19z dXBlcnNwZWVkKGZ1bmMtPmdhZGdldCkgJiYKLQkJZnVuYy0+ZmZzLT5zc19kZXNjc19jb3VudDsK Kwljb25zdCBpbnQgaGlnaCA9ICEhZnVuYy0+ZmZzLT5oc19kZXNjc19jb3VudDsKKwljb25zdCBp bnQgc3VwZXIgPSAhIWZ1bmMtPmZmcy0+c3NfZGVzY3NfY291bnQ7CiAKIAlpbnQgZnNfbGVuLCBo c19sZW4sIHNzX2xlbiwgcmV0LCBpOwogCXN0cnVjdCBmZnNfZXAgKmVwc19wdHI7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.codeaurora.org ([198.145.29.96]:58728 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbeAXIN1 (ORCPT ); Wed, 24 Jan 2018 03:13:27 -0500 From: Jack Pham To: Felipe Balbi , Michal Nazarewicz , Andrzej Pietrasiewicz Cc: Mayank Rana , linux-usb@vger.kernel.org, Jack Pham , stable@vger.kernel.org Subject: [PATCH] usb: gadget: f_fs: Process all descriptors during bind Date: Wed, 24 Jan 2018 00:11:53 -0800 Message-Id: <20180124081153.32726-1-jackp@codeaurora.org> Sender: stable-owner@vger.kernel.org List-ID: During _ffs_func_bind(), the received descriptors are evaluated to prepare for binding with the gadget in order to allocate endpoints and optionally set up OS descriptors. However, the high- and super-speed descriptors are only parsed based on whether the gadget_is_dualspeed() and gadget_is_superspeed() calls are true, respectively. This is a problem in case a userspace program always provides all of the {full,high,super,OS} descriptors when configuring a function. Then, for example if a gadget device is not capable of SuperSpeed, the call to ffs_do_descs() for the SS descriptors is skipped, resulting in an incorrect offset calculation for the vla_ptr when moving on to the OS descriptors that follow. This causes ffs_do_os_descs() to fail as it is now looking at the SS descriptors' offset within the raw_descs buffer instead. _ffs_func_bind() should evaluate the descriptors unconditionally, so remove the checks for gadget speed. Fixes: f0175ab51993 ("usb: gadget: f_fs: OS descriptors support") Cc: stable@vger.kernel.org Co-Developed-by: Mayank Rana Signed-off-by: Mayank Rana Signed-off-by: Jack Pham --- drivers/usb/gadget/function/f_fs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index b6cf5ab..5f2dafb5 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -2976,10 +2976,8 @@ static int _ffs_func_bind(struct usb_configuration *c, struct ffs_data *ffs = func->ffs; const int full = !!func->ffs->fs_descs_count; - const int high = gadget_is_dualspeed(func->gadget) && - func->ffs->hs_descs_count; - const int super = gadget_is_superspeed(func->gadget) && - func->ffs->ss_descs_count; + const int high = !!func->ffs->hs_descs_count; + const int super = !!func->ffs->ss_descs_count; int fs_len, hs_len, ss_len, ret, i; struct ffs_ep *eps_ptr; -- 2.9.1.200.gb1ec08f