Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f0d5be7 authored by Andrey Konovalov's avatar Andrey Konovalov
Browse files

UPSTREAM: usb: raw-gadget: fix return value of ep read ioctls 



They must return the number of bytes transferred during the data stage.

Fixes: 068fbff4f860 ("usb: raw-gadget: Fix copy_to/from_user() checks")
Fixes: f2c2e717642c ("usb: gadget: add raw-gadget interface")
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Bug: 147413187
(cherry picked from commit 6e507644209b4a043363e165855a3a3050c4d40e)
Change-Id: I16f2ab1d881a2313bd1ec6b77aa0229fe08fe25b
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
parent 2916afca

drivers/usb/gadget/legacy/raw_gadget.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -669,12 +669,14 @@ static int raw_ioctl_ep0_read(struct raw_dev *dev, unsigned long value) 
	if (IS_ERR(data))

	if (IS_ERR(data))

		return PTR_ERR(data);

		return PTR_ERR(data);

	ret = raw_process_ep0_io(dev, &io, data, false);

	ret = raw_process_ep0_io(dev, &io, data, false);

	if (ret)

	if (ret < 0)

		goto free;

		goto free;





	length = min(io.length, (unsigned int)ret);

	length = min(io.length, (unsigned int)ret);

	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))

	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))

		ret = -EFAULT;

		ret = -EFAULT;

	else

		ret = length;

free:

free:

	kfree(data);

	kfree(data);

	return ret;

	return ret;
@@ -964,12 +966,14 @@ static int raw_ioctl_ep_read(struct raw_dev *dev, unsigned long value) 
	if (IS_ERR(data))

	if (IS_ERR(data))

		return PTR_ERR(data);

		return PTR_ERR(data);

	ret = raw_process_ep_io(dev, &io, data, false);

	ret = raw_process_ep_io(dev, &io, data, false);

	if (ret)

	if (ret < 0)

		goto free;

		goto free;





	length = min(io.length, (unsigned int)ret);

	length = min(io.length, (unsigned int)ret);

	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))

	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))

		ret = -EFAULT;

		ret = -EFAULT;

	else

		ret = length;

free:

free:

	kfree(data);

	kfree(data);

	return ret;

	return ret;