From 933cb6ebf73d24a5a45dc849e2811a543b5fdef4 Mon Sep 17 00:00:00 2001 From: Benson Leung Date: Fri, 6 May 2016 00:58:19 +0000 Subject: [PATCH] Revert "CHROMIUM: usb: gadget: f_fs: Fix kernel panic for SuperSpeed" This reverts commit 65386540ecae3a8c714d98f8d104b253fbc79336. BUG=b/28609271 TEST=No boot loop on switching to recovery/factory wipe. Change-Id: I67ab8c0a509ed0827a6892adf4390ca82830785b Reviewed-on: https://chromium-review.googlesource.com/342833 Reviewed-by: Stephen Barber Commit-Queue: Stephen Barber Tested-by: Stephen Barber --- drivers/usb/gadget/function/f_fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index c791577fcfacb..d29807de32fdd 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -2062,7 +2062,8 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type, int i; if (len < sizeof(*d) || - d->bFirstInterfaceNumber >= ffs->interfaces_count) + d->bFirstInterfaceNumber >= ffs->interfaces_count || + d->Reserved1) return -EINVAL; for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i) if (d->Reserved2[i])