From: Takashi Iwai <tiwai@suse.de>
To: yskelg@gmail.com
Cc: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
skhan@linuxfoundation.org,
linux-kernel-mentees@lists.linuxfoundation.org,
Austin Kim <austindh.kim@gmail.com>,
shjy180909@gmail.com, linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] line6: add midibuf init failure handling in line6_init_midi()
Date: Fri, 17 May 2024 10:32:13 +0200 [thread overview]
Message-ID: <8734qg260i.wl-tiwai@suse.de> (raw)
In-Reply-To: <20240516174737.415912-1-yskelg@gmail.com>
On Thu, 16 May 2024 19:47:38 +0200,
yskelg@gmail.com wrote:
>
> From: Yunseong Kim <yskelg@gmail.com>
>
> This patch fixes potential memory allocation failures in the
> line6_midibuf_init(). If either midibuf_in, midibuf_out allocation
> line6_midibuf_init call failed, the allocated memory for line6midi
> might have been leaked.
>
> This patch introduces an error handling label and uses goto to jump there
> in case of allocation failures. A kfree call is added to release any
> partially allocated memory before returning the error code.
>
> Signed-off-by: Yunseong Kim <yskelg@gmail.com>
The allocated object is already freed by snd_line6_midi_free() that is
called via rawmidi private_free at its destruction. So your change
would lead to a double-free.
thanks,
Takashi
> ---
> sound/usb/line6/midi.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c
> index 0838632c788e..abcf58f46673 100644
> --- a/sound/usb/line6/midi.c
> +++ b/sound/usb/line6/midi.c
> @@ -283,13 +283,18 @@ int line6_init_midi(struct usb_line6 *line6)
>
> err = line6_midibuf_init(&line6midi->midibuf_in, MIDI_BUFFER_SIZE, 0);
> if (err < 0)
> - return err;
> + goto error;
>
> err = line6_midibuf_init(&line6midi->midibuf_out, MIDI_BUFFER_SIZE, 1);
> if (err < 0)
> - return err;
> + goto error;
>
> line6->line6midi = line6midi;
> return 0;
> +
> +error:
> + kfree(line6midi);
> + return err;
> +
> }
> EXPORT_SYMBOL_GPL(line6_init_midi);
> --
> 2.34.1
>
next prev parent reply other threads:[~2024-05-17 8:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 17:47 [PATCH] line6: add midibuf init failure handling in line6_init_midi() yskelg
2024-05-16 18:58 ` Bjorn Helgaas
2024-05-17 8:32 ` Takashi Iwai [this message]
2024-05-17 17:10 ` Yunseong Kim
2024-05-17 17:51 ` Takashi Iwai
2024-05-18 6:00 ` Yunseong Kim
2024-05-17 17:44 ` Bjorn Helgaas
2024-05-18 5:58 ` Yunseong Kim
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=8734qg260i.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=austindh.kim@gmail.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=shjy180909@gmail.com \
--cc=skhan@linuxfoundation.org \
--cc=tiwai@suse.com \
--cc=yskelg@gmail.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