Merge "USB: gadget: mbim: Avoid copying uninitialized data to userspace" (fde1894a) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/gadget/function/f_mbim.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2030,7 +2030,7 @@ static long mbim_ioctl(struct file *fp, unsigned cmd, unsigned long arg)
		default:
		ret = -ENODEV;
		pr_err("unknown transport\n");
		break;
		goto fail;
		}

		ret = copy_to_user((void __user *)arg, &info,
		@@ -2046,6 +2046,7 @@ static long mbim_ioctl(struct file *fp, unsigned cmd, unsigned long arg)
		ret = -EINVAL;
		}

		fail:
		mbim_unlock(&mbim->ioctl_excl);

		return ret;