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: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200914153756.3412156-2-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 27e83e55a59014f106f0cb240e610b7e18761fa2..357b149b20d3a1cafdbb1d36aba1a157984166f0 100644 (file)
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -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]);
 

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 20c555db4621d58425cdd7cb559243af732bc357..0b3963d7ec3800991f7b8d4df235718531f1f41d 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -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,

diff --git a/sound/usb/helper.c b/sound/usb/helper.c
index 4c12cc5b53fda0dd5085cfec00c08cc28d86f53d..cf92d71107731da59b3b9210ab30b5689e654024 100644 (file)
--- a/sound/usb/helper.c
+++ b/sound/usb/helper.c
@@ -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) {

diff --git a/sound/usb/helper.h b/sound/usb/helper.h
index 5e8a18b4e7b96812778dd15da1f94f0c25695777..f5b4c6647e4df2d23401268923782622f797486d 100644 (file)
--- a/sound/usb/helper.h
+++ b/sound/usb/helper.h
@@ -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);

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index 0ffff7640892af689ab6827cf4af3312454aa327..9609c6d9655c39a08d91be5a5195ed14a9979b4a 100644 (file)
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -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);

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 75bbdc6912433796eeea34d9cd5647de59c45576..1b482848e73b63ba87350d37d4cdfe4d065b85a1 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -856,7 +856,7 @@ static int snd_usb_accessmusic_boot_quirk(struct usb_device *dev)
        static const u8 seq[] = { 0x4e, 0x73, 0x52, 0x01 };
        void *buf;
 
-       if (snd_usb_pipe_sanity_check(dev, usb_sndintpipe(dev, 0x05)))
+       if (usb_pipe_type_check(dev, usb_sndintpipe(dev, 0x05)))
                return -EINVAL;
        buf = kmemdup(seq, ARRAY_SIZE(seq), GFP_KERNEL);
        if (!buf)
@@ -885,7 +885,7 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
 {
        int ret;
 
-       if (snd_usb_pipe_sanity_check(dev, usb_sndctrlpipe(dev, 0)))
+       if (usb_pipe_type_check(dev, usb_sndctrlpipe(dev, 0)))
                return -EINVAL;
        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                                  0xaf, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -994,7 +994,7 @@ static int snd_usb_axefx3_boot_quirk(struct usb_device *dev)
 
        dev_dbg(&dev->dev, "Waiting for Axe-Fx III to boot up...\n");
 
-       if (snd_usb_pipe_sanity_check(dev, usb_sndctrlpipe(dev, 0)))
+       if (usb_pipe_type_check(dev, usb_sndctrlpipe(dev, 0)))
                return -EINVAL;
        /* If the Axe-Fx III has not fully booted, it will timeout when trying
         * to enable the audio streaming interface. A more generous timeout is
@@ -1028,7 +1028,7 @@ static int snd_usb_motu_microbookii_communicate(struct usb_device *dev, u8 *buf,
 {
        int err, actual_length;
 
-       if (snd_usb_pipe_sanity_check(dev, usb_sndintpipe(dev, 0x01)))
+       if (usb_pipe_type_check(dev, usb_sndintpipe(dev, 0x01)))
                return -EINVAL;
        err = usb_interrupt_msg(dev, usb_sndintpipe(dev, 0x01), buf, *length,
                                &actual_length, 1000);
@@ -1040,7 +1040,7 @@ static int snd_usb_motu_microbookii_communicate(struct usb_device *dev, u8 *buf,
 
        memset(buf, 0, buf_size);
 
-       if (snd_usb_pipe_sanity_check(dev, usb_rcvintpipe(dev, 0x82)))
+       if (usb_pipe_type_check(dev, usb_rcvintpipe(dev, 0x82)))
                return -EINVAL;
        err = usb_interrupt_msg(dev, usb_rcvintpipe(dev, 0x82), buf, buf_size,
                                &actual_length, 1000);
@@ -1127,7 +1127,7 @@ static int snd_usb_motu_m_series_boot_quirk(struct usb_device *dev)
 {
        int ret;
 
-       if (snd_usb_pipe_sanity_check(dev, usb_sndctrlpipe(dev, 0)))
+       if (usb_pipe_type_check(dev, usb_sndctrlpipe(dev, 0)))
                return -EINVAL;
        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                              1, USB_TYPE_VENDOR | USB_RECIP_DEVICE,