| From 750718db59ce2ee1cb95fb42e1cc5908b0650cba Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 May 2021 13:57:03 +0200 |
| Subject: Revert "ALSA: usx2y: Fix potential NULL pointer dereference" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| [ Upstream commit 4667a6fc1777ce071504bab570d3599107f4790f ] |
| |
| This reverts commit a2c6433ee5a35a8de6d563f6512a26f87835ea0f. |
| |
| Because of recent interactions with developers from @umn.edu, all |
| commits from them have been recently re-reviewed to ensure if they were |
| correct or not. |
| |
| Upon review, this commit was found to be incorrect for the reasons |
| below, so it must be reverted. It will be fixed up "correctly" in a |
| later kernel change. |
| |
| The original patch was incorrect, and would leak memory if the error |
| path the patch added was hit. |
| |
| Cc: Aditya Pakki <pakki001@umn.edu> |
| Reviewed-by: Takashi Iwai <tiwai@suse.de> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-37-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/usb/usx2y/usb_stream.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c |
| index 091c071b270a..6bba17bf689a 100644 |
| --- a/sound/usb/usx2y/usb_stream.c |
| +++ b/sound/usb/usx2y/usb_stream.c |
| @@ -91,12 +91,7 @@ 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) || |
| -- |
| 2.30.2 |
| |
