ALSA: usx2y: Add sanity checks for invalid EPs

usx2y driver sets up URBs containing the fixed endpoints without
validation.  This may end up with an oops-like kernel warning when
submitted.

For avoiding it, this patch adds the calls of the new sanity-check
helper for URBs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 4569c0efac0a864b557d4a597aff1c3bffad8957..0ddf29267d70fc8f10e68109b70fd6c6798ac856 100644 (file)
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -279,6 +279,9 @@ int usX2Y_AsyncSeq04_init(struct usX2Ydev *usX2Y)
                                                usX2Y->AS04.buffer + URB_DataLen_AsyncSeq*i, 0,
                                                i_usX2Y_Out04Int, usX2Y
                                );
+                       err = usb_urb_ep_type_check(usX2Y->AS04.urb[i]);
+                       if (err < 0)
+                               break;
                }
        return err;
 }
@@ -298,6 +301,8 @@ int usX2Y_In04_init(struct usX2Ydev *usX2Y)
                         usX2Y->In04Buf, 21,
                         i_usX2Y_In04Int, usX2Y,
                         10);
+       if (usb_urb_ep_type_check(usX2Y->In04urb))
+               return -EINVAL;
        return usb_submit_urb(usX2Y->In04urb, GFP_KERNEL);
 }
 

diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index f93b355756e6027e694257c0e2ab829767c7be98..345e439aa95b43dc237f8ca26032547b9115c422 100644 (file)
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -677,6 +677,9 @@ static int usX2Y_rate_set(struct usX2Ydev *usX2Y, int rate)
                        usb_fill_bulk_urb(us->urb[i], usX2Y->dev, usb_sndbulkpipe(usX2Y->dev, 4),
                                          usbdata + i, 2, i_usX2Y_04Int, usX2Y);
                }
+               err = usb_urb_ep_type_check(us->urb[0]);
+               if (err < 0)
+                       goto cleanup;
                us->submitted = 0;
                us->len =       NOOF_SETRATE_URBS;
                usX2Y->US04 =   us;