Commit 5ef43bdc authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: line6: Fix memory leak at line6_init_pcm() error path

commit 1bc8d18c upstream.

I forgot to release the allocated object at the early error path in
line6_init_pcm().  For addressing it, slightly shuffle the code so
that the PCM destructor (pcm->private_free) is assigned properly
before all error paths.

Fixes: 34501219 ("ALSA: line6: Fix write on zero-sized buffer")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c94c0bf8
...@@ -554,6 +554,15 @@ int line6_init_pcm(struct usb_line6 *line6, ...@@ -554,6 +554,15 @@ int line6_init_pcm(struct usb_line6 *line6,
line6pcm->volume_monitor = 255; line6pcm->volume_monitor = 255;
line6pcm->line6 = line6; line6pcm->line6 = line6;
spin_lock_init(&line6pcm->out.lock);
spin_lock_init(&line6pcm->in.lock);
line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
line6->line6pcm = line6pcm;
pcm->private_data = line6pcm;
pcm->private_free = line6_cleanup_pcm;
line6pcm->max_packet_size_in = line6pcm->max_packet_size_in =
usb_maxpacket(line6->usbdev, usb_maxpacket(line6->usbdev,
usb_rcvisocpipe(line6->usbdev, ep_read), 0); usb_rcvisocpipe(line6->usbdev, ep_read), 0);
...@@ -566,15 +575,6 @@ int line6_init_pcm(struct usb_line6 *line6, ...@@ -566,15 +575,6 @@ int line6_init_pcm(struct usb_line6 *line6,
return -EINVAL; return -EINVAL;
} }
spin_lock_init(&line6pcm->out.lock);
spin_lock_init(&line6pcm->in.lock);
line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
line6->line6pcm = line6pcm;
pcm->private_data = line6pcm;
pcm->private_free = line6_cleanup_pcm;
err = line6_create_audio_out_urbs(line6pcm); err = line6_create_audio_out_urbs(line6pcm);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment