diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-08-21 14:00:02 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-08-21 14:00:02 -0400 |
commit | 1bc8d18c75fef3b478dbdfef722aae09e2a9fde7 (patch) | |
tree | 2929483196823ee8c65f0148f5a27d486a961fdb /sound/usb/line6 | |
parent | 6de3c9e3f6b3eaf66859e1379b3f35dda781416b (diff) |
ALSA: line6: Fix memory leak at line6_init_pcm() error path
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: 3450121997ce ("ALSA: line6: Fix write on zero-sized buffer")
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6')
-rw-r--r-- | sound/usb/line6/pcm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 2c03e0f6bf72..f70211e6b174 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c | |||
@@ -550,6 +550,15 @@ int line6_init_pcm(struct usb_line6 *line6, | |||
550 | line6pcm->volume_monitor = 255; | 550 | line6pcm->volume_monitor = 255; |
551 | line6pcm->line6 = line6; | 551 | line6pcm->line6 = line6; |
552 | 552 | ||
553 | spin_lock_init(&line6pcm->out.lock); | ||
554 | spin_lock_init(&line6pcm->in.lock); | ||
555 | line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD; | ||
556 | |||
557 | line6->line6pcm = line6pcm; | ||
558 | |||
559 | pcm->private_data = line6pcm; | ||
560 | pcm->private_free = line6_cleanup_pcm; | ||
561 | |||
553 | line6pcm->max_packet_size_in = | 562 | line6pcm->max_packet_size_in = |
554 | usb_maxpacket(line6->usbdev, | 563 | usb_maxpacket(line6->usbdev, |
555 | usb_rcvisocpipe(line6->usbdev, ep_read), 0); | 564 | usb_rcvisocpipe(line6->usbdev, ep_read), 0); |
@@ -562,15 +571,6 @@ int line6_init_pcm(struct usb_line6 *line6, | |||
562 | return -EINVAL; | 571 | return -EINVAL; |
563 | } | 572 | } |
564 | 573 | ||
565 | spin_lock_init(&line6pcm->out.lock); | ||
566 | spin_lock_init(&line6pcm->in.lock); | ||
567 | line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD; | ||
568 | |||
569 | line6->line6pcm = line6pcm; | ||
570 | |||
571 | pcm->private_data = line6pcm; | ||
572 | pcm->private_free = line6_cleanup_pcm; | ||
573 | |||
574 | err = line6_create_audio_out_urbs(line6pcm); | 574 | err = line6_create_audio_out_urbs(line6pcm); |
575 | if (err < 0) | 575 | if (err < 0) |
576 | return err; | 576 | return err; |