Merge "usb: gadget: f_fs: Fix kernel panic if use_os_string not set" (bcc6bc7c) · Commits · e / devices / android_kernel_sony_msm8998

drivers/usb/gadget/function/f_fs.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -3353,7 +3353,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
		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;

		@@ -3367,10 +3367,12 @@ static int _ffs_func_bind(struct usb_configuration *c,
		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,
		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;