Revert "Revert "ALSA: usx2y: Fix potential NULL pointer dereference""

commit 27b57bb76a897be80494ee11ee4e85326d19383d upstream.

This reverts commit 4667a6fc1777ce071504bab570d3599107f4790f.

Takashi writes:
	I have already started working on the bigger cleanup of this driver
	code based on 5.13-rc1, so could you drop this revert?

I missed our previous discussion about this, my fault for applying it.

Reported-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
index 6bba17bf689ac1c318d2490a87e7f0b7bc6b7621..091c071b270af30925223b9ede5813e23fc82099 100644 (file)
--- a/sound/usb/usx2y/usb_stream.c
+++ b/sound/usb/usx2y/usb_stream.c
@@ -91,7 +91,12 @@ static int init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,
 
        for (u = 0; u < USB_STREAM_NURBS; ++u) {
                sk->inurb[u] = usb_alloc_urb(sk->n_o_ps, GFP_KERNEL);
+               if (!sk->inurb[u])
+                       return -ENOMEM;
+
                sk->outurb[u] = usb_alloc_urb(sk->n_o_ps, GFP_KERNEL);
+               if (!sk->outurb[u])
+                       return -ENOMEM;
        }
 
        if (init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe) ||