ALSA: usx2y: Fix invalid stream URBs

[platform/kernel/linux-starfive.git] / sound / usb / usx2y / usb_stream.c

diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
index 4dab490..b0f8979 100644 (file)
--- a/sound/usb/usx2y/usb_stream.c
+++ b/sound/usb/usx2y/usb_stream.c
@@ -56,7 +56,7 @@ check:
                    lb, s->period_size);
 }
 
-static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
+static int init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
                           struct urb **urbs, char *transfer,
                           struct usb_device *dev, int pipe)
 {
@@ -77,6 +77,8 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
                urb->interval = 1;
                if (usb_pipeout(pipe))
                        continue;
+               if (usb_urb_ep_type_check(urb))
+                       return -EINVAL;
 
                urb->transfer_buffer_length = transfer_length;
                desc = urb->iso_frame_desc;
@@ -87,9 +89,11 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
                        desc[p].length = maxpacket;
                }
        }
+
+       return 0;
 }
 
-static void init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
+static int init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
                      struct usb_device *dev, int in_pipe, int out_pipe)
 {
        struct usb_stream       *s = sk->s;
@@ -103,9 +107,12 @@ static void init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
                sk->outurb[u] = usb_alloc_urb(sk->n_o_ps, GFP_KERNEL);
        }
 
-       init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe);
-       init_pipe_urbs(sk, use_packsize, sk->outurb, sk->write_page, dev,
-                      out_pipe);
+       if (init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe) ||
+           init_pipe_urbs(sk, use_packsize, sk->outurb, sk->write_page, dev,
+                          out_pipe))
+               return -EINVAL;
+
+       return 0;
 }
 
 
@@ -191,7 +198,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk,
        }
 
        pg = get_order(read_size);
-       sk->s = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO, pg);
+       sk->s = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO|
+                                         __GFP_NOWARN, pg);
        if (!sk->s) {
                snd_printk(KERN_WARNING "couldn't __get_free_pages()\n");
                goto out;
@@ -211,7 +219,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk,
        pg = get_order(write_size);
 
        sk->write_page =
-               (void *)__get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO, pg);
+               (void *)__get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO|
+                                        __GFP_NOWARN, pg);
        if (!sk->write_page) {
                snd_printk(KERN_WARNING "couldn't __get_free_pages()\n");
                usb_stream_free(sk);
@@ -224,7 +233,11 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk,
        else
                sk->freqn = get_usb_high_speed_rate(sample_rate);
 
-       init_urbs(sk, use_packsize, dev, in_pipe, out_pipe);
+       if (init_urbs(sk, use_packsize, dev, in_pipe, out_pipe) < 0) {
+               usb_stream_free(sk);
+               return NULL;
+       }
+
        sk->s->state = usb_stream_stopped;
 out:
        return sk->s;