commit b97649189e9b7422d30210c6dd52c9b45728960f
author Jim Lin <jilin@nvidia.com> Wed Apr 04 14:20:34 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 04 14:20:34 2018 -0700
tree 73b95dc18ed001f625a9d76a5cdf5dca9a37451a
parent 0e0e244fed5e5dd929eb4047b1994e994962d2d3
parent a1f8f5e26fa59b84e333c0bd0e26cf101ba7d33a

UPSTREAM: usb: gadget: f_fs: Fix kernel panic if use_os_string not set
am: a1f8f5e26f

Change-Id: I95c802baa9db45714001822a5e56dc1006428692

drivers/usb/gadget/function/f_fs.c

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 6c2befa..7854e9d 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3304,7 +3304,7 @@
 		goto error;
 
 	func->function.os_desc_table = vla_ptr(vlabuf, d, os_desc_table);
-	if (c->cdev->use_os_string)
+	if (c->cdev->use_os_string) {
 		for (i = 0; i < ffs->interfaces_count; ++i) {
 			struct usb_os_desc *desc;
 
@@ -3315,13 +3315,15 @@
 				vla_ptr(vlabuf, d, ext_compat) + i * 16;
 			INIT_LIST_HEAD(&desc->ext_prop);
 		}
-	ret = ffs_do_os_descs(ffs->ms_os_descs_count,
-			      vla_ptr(vlabuf, d, raw_descs) +
-			      fs_len + hs_len + ss_len,
-			      d_raw_descs__sz - fs_len - hs_len - ss_len,
-			      __ffs_func_bind_do_os_desc, func);
-	if (unlikely(ret < 0))
-		goto error;
+		ret = ffs_do_os_descs(ffs->ms_os_descs_count,
+				      vla_ptr(vlabuf, d, raw_descs) +
+				      fs_len + hs_len + ss_len,
+				      d_raw_descs__sz - fs_len - hs_len -
+				      ss_len,
+				      __ffs_func_bind_do_os_desc, func);
+		if (unlikely(ret < 0))
+			goto error;
+	}
 	func->function.os_desc_n =
 		c->cdev->use_os_string ? ffs->interfaces_count : 0;