From: Takashi Iwai <tiwai@suse.de>
To: Salah Triki <salah.triki@gmail.com>
Cc: perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] sound: usb: line6: free allocated urbs on failure
Date: Thu, 15 Jul 2021 08:48:44 +0200 [thread overview]
Message-ID: <s5hy2a8xeb7.wl-tiwai@suse.de> (raw)
In-Reply-To: <20210715005625.GA1997259@pc>
On Thu, 15 Jul 2021 02:56:25 +0200,
Salah Triki wrote:
>
> Free allocated urbs on failure in order to prevent memory leaks.
>
> Signed-off-by: Salah Triki <salah.triki@gmail.com>
This will lead to double-free. The resources are freed in the
destructor of PCM component, line6_cleanup_pcm().
Takashi
> ---
> sound/usb/line6/capture.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
> index 970c9bdce0b2..345b75ede5d5 100644
> --- a/sound/usb/line6/capture.c
> +++ b/sound/usb/line6/capture.c
> @@ -258,6 +258,7 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
> {
> struct usb_line6 *line6 = line6pcm->line6;
> int i;
> + int ret;
>
> line6pcm->in.urbs = kcalloc(line6->iso_buffers, sizeof(struct urb *),
> GFP_KERNEL);
> @@ -272,8 +273,10 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
> urb = line6pcm->in.urbs[i] =
> usb_alloc_urb(LINE6_ISO_PACKETS, GFP_KERNEL);
>
> - if (urb == NULL)
> - return -ENOMEM;
> + if (urb == NULL) {
> + ret = -ENOMEM;
> + goto enomem;
> + }
>
> urb->dev = line6->usbdev;
> urb->pipe =
> @@ -286,9 +289,20 @@ int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm)
> urb->interval = LINE6_ISO_INTERVAL;
> urb->error_count = 0;
> urb->complete = audio_in_callback;
> - if (usb_urb_ep_type_check(urb))
> - return -EINVAL;
> + if (usb_urb_ep_type_check(urb)) {
> + ret = -EINVAL;
> + goto einval;
> + }
> }
>
> return 0;
> +
> +enomem:
> + i--;
> +
> +einval:
> + while (i >= 0)
> + usb_free_urb(line6pcm->in.urbs[i--]);
> +
> + return ret;
> }
> --
> 2.25.1
>
prev parent reply other threads:[~2021-07-15 6:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 0:56 [PATCH] sound: usb: line6: free allocated urbs on failure Salah Triki
2021-07-15 6:48 ` Takashi Iwai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hy2a8xeb7.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=salah.triki@gmail.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).