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

Commit 7152b592 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: fix usbfs regression 



This patch (as1352) fixes a bug in the way isochronous input data is
returned to userspace for usbfs transfers.  The entire buffer must be
copied, not just the first actual_length bytes, because the individual
packets will be discontiguous if any of them are short.

Reported-by: default avatarMarkus Rechberger <mrechberger@gmail.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a3d3203e

drivers/usb/core/devio.c

+14 −3
Original line number Diff line number Diff line
@@ -1207,6 +1207,13 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
			free_async(as);

			return -ENOMEM;

		}

		/* Isochronous input data may end up being discontiguous

		 * if some of the packets are short.  Clear the buffer so

		 * that the gaps don't leak kernel data to userspace.

		 */

		if (is_in && uurb->type == USBDEVFS_URB_TYPE_ISO)

			memset(as->urb->transfer_buffer, 0,

					uurb->buffer_length);

	}

	as->urb->dev = ps->dev;

	as->urb->pipe = (uurb->type << 30) |
@@ -1345,10 +1352,14 @@ static int processcompl(struct async *as, void __user * __user *arg) 
	void __user *addr = as->userurb;

	unsigned int i;



	if (as->userbuffer && urb->actual_length)

		if (copy_to_user(as->userbuffer, urb->transfer_buffer,

				 urb->actual_length))

	if (as->userbuffer && urb->actual_length) {

		if (urb->number_of_packets > 0)		/* Isochronous */

			i = urb->transfer_buffer_length;

		else					/* Non-Isoc */

			i = urb->actual_length;

		if (copy_to_user(as->userbuffer, urb->transfer_buffer, i))

			goto err_out;

	}

	if (put_user(as->status, &userurb->status))

		goto err_out;

	if (put_user(urb->actual_length, &userurb->actual_length))