Commit fcc2cc1f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: move snd_usb_pipe_sanity_check into the USB core 



snd_usb_pipe_sanity_check() is a great function, so let's move it into
the USB core so that other parts of the kernel, including the USB core,
can call it.

Name it usb_pipe_type_check() to match the existing
usb_urb_ep_type_check() call, which now uses this function.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Eli Billauer <eli.billauer@gmail.com>
Cc: Emiliano Ingrassia <ingrassia@epigenesys.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Alexander Tsoy <alexander@tsoy.me>
Cc: "Geoffrey D. Bennett" <g@b4.vu>
Cc: Jussi Laako <jussi@sonarnerd.net>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: Dmitry Panchenko <dmitry@d-systems.ee>
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Jesus Ramos <jesus-ramos@live.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200914153756.3412156-2-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4e6451d

drivers/usb/core/urb.c

+23 −8
Original line number Diff line number Diff line
@@ -192,24 +192,39 @@ static const int pipetypes[4] = { 
};



/**

 * usb_urb_ep_type_check - sanity check of endpoint in the given urb

 * @urb: urb to be checked

 * usb_pipe_type_check - sanity check of a specific pipe for a usb device

 * @dev: struct usb_device to be checked

 * @pipe: pipe to check

 *

 * This performs a light-weight sanity check for the endpoint in the

 * given urb.  It returns 0 if the urb contains a valid endpoint, otherwise

 * a negative error code.

 * given usb device.  It returns 0 if the pipe is valid for the specific usb

 * device, otherwise a negative error code.

 */

int usb_urb_ep_type_check(const struct urb *urb)

int usb_pipe_type_check(struct usb_device *dev, unsigned int pipe)

{

	const struct usb_host_endpoint *ep;



	ep = usb_pipe_endpoint(urb->dev, urb->pipe);

	ep = usb_pipe_endpoint(dev, pipe);

	if (!ep)

		return -EINVAL;

	if (usb_pipetype(urb->pipe) != pipetypes[usb_endpoint_type(&ep->desc)])

	if (usb_pipetype(pipe) != pipetypes[usb_endpoint_type(&ep->desc)])

		return -EINVAL;

	return 0;

}

EXPORT_SYMBOL_GPL(usb_pipe_type_check);



/**

 * usb_urb_ep_type_check - sanity check of endpoint in the given urb

 * @urb: urb to be checked

 *

 * This performs a light-weight sanity check for the endpoint in the

 * given urb.  It returns 0 if the urb contains a valid endpoint, otherwise

 * a negative error code.

 */

int usb_urb_ep_type_check(const struct urb *urb)

{

	return usb_pipe_type_check(urb->dev, urb->pipe);

}

EXPORT_SYMBOL_GPL(usb_urb_ep_type_check);



/**
@@ -474,7 +489,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
	 */



	/* Check that the pipe's type matches the endpoint's type */

	if (usb_urb_ep_type_check(urb))

	if (usb_pipe_type_check(urb->dev, urb->pipe))

		dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n",

			usb_pipetype(urb->pipe), pipetypes[xfertype]);

include/linux/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -1764,6 +1764,7 @@ static inline int usb_urb_dir_out(struct urb *urb) 
	return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_OUT;

}



int usb_pipe_type_check(struct usb_device *dev, unsigned int pipe);

int usb_urb_ep_type_check(const struct urb *urb);



void *usb_alloc_coherent(struct usb_device *dev, size_t size,

sound/usb/helper.c

+1 −15
Original line number Diff line number Diff line
@@ -63,20 +63,6 @@ void *snd_usb_find_csint_desc(void *buffer, int buflen, void *after, u8 dsubtype 
	return NULL;

}



/* check the validity of pipe and EP types */

int snd_usb_pipe_sanity_check(struct usb_device *dev, unsigned int pipe)

{

	static const int pipetypes[4] = {

		PIPE_CONTROL, PIPE_ISOCHRONOUS, PIPE_BULK, PIPE_INTERRUPT

	};

	struct usb_host_endpoint *ep;



	ep = usb_pipe_endpoint(dev, pipe);

	if (!ep || usb_pipetype(pipe) != pipetypes[usb_endpoint_type(&ep->desc)])

		return -EINVAL;

	return 0;

}



/*

 * Wrapper for usb_control_msg().

 * Allocates a temp buffer to prevent dmaing from/to the stack.
@@ -89,7 +75,7 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, 
	void *buf = NULL;

	int timeout;



	if (snd_usb_pipe_sanity_check(dev, pipe))

	if (usb_pipe_type_check(dev, pipe))

		return -EINVAL;



	if (size > 0) {

sound/usb/helper.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ unsigned int snd_usb_combine_bytes(unsigned char *bytes, int size); 
void *snd_usb_find_desc(void *descstart, int desclen, void *after, u8 dtype);

void *snd_usb_find_csint_desc(void *descstart, int desclen, void *after, u8 dsubtype);



int snd_usb_pipe_sanity_check(struct usb_device *dev, unsigned int pipe);

int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe,

		    __u8 request, __u8 requesttype, __u16 value, __u16 index,

		    void *data, __u16 size);

sound/usb/mixer_scarlett_gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -1978,7 +1978,7 @@ static int scarlett2_mixer_status_create(struct usb_mixer_interface *mixer) 
		return 0;

	}



	if (snd_usb_pipe_sanity_check(dev, pipe))

	if (usb_pipe_type_check(dev, pipe))

		return -EINVAL;



	mixer->urb = usb_alloc_urb(0, GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE