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

Commit c051e2d3 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: usbfs: Filter flags passed in from user space 



commit 446f666da9f019ce2ffd03800995487e79a91462 upstream.

USBDEVFS_URB_ISO_ASAP must be accepted only for ISO endpoints.
Improve sanity checking.

Reported-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a98161fd

drivers/usb/core/devio.c

+9 −5
Original line number Diff line number Diff line
@@ -1290,14 +1290,18 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb 
	int number_of_packets = 0;

	unsigned int stream_id = 0;

	void *buf;



	if (uurb->flags & ~(USBDEVFS_URB_ISO_ASAP |

				USBDEVFS_URB_SHORT_NOT_OK |

	unsigned long mask =	USBDEVFS_URB_SHORT_NOT_OK |

				USBDEVFS_URB_BULK_CONTINUATION |

				USBDEVFS_URB_NO_FSBR |

				USBDEVFS_URB_ZERO_PACKET |

				USBDEVFS_URB_NO_INTERRUPT))

				USBDEVFS_URB_NO_INTERRUPT;

	/* USBDEVFS_URB_ISO_ASAP is a special case */

	if (uurb->type == USBDEVFS_URB_TYPE_ISO)

		mask |= USBDEVFS_URB_ISO_ASAP;



	if (uurb->flags & ~mask)

			return -EINVAL;



	if ((unsigned int)uurb->buffer_length >= USBFS_XFER_MAX)

		return -EINVAL;

	if (uurb->buffer_length > 0 && !uurb->buffer)