path: root/sound
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 21:40:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 21:40:38 +0200
commit27b57bb76a897be80494ee11ee4e85326d19383d (patch)
treedd1160ddfb8804fae397061a53dea6155f416e73 /sound
parenta3626bcf5fafad0ded410b269e21f37bdaf2baf4 (diff)
Revert "Revert "ALSA: usx2y: Fix potential NULL pointer dereference""
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>
Diffstat (limited to 'sound')
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
index 6bba17bf689a..091c071b270a 100644
--- 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) ||

Privacy Policy