summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWenwen Wang <wenwen@cs.uga.edu>2019-08-08 00:50:58 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-16 10:12:51 +0200
commitbc972b6b52e2ddd93b7532cd2213d9c2be5d6340 (patch)
tree7f31b074598f549cc3c20e4c395a819f2e56cb1e /sound
parentedc388566a1d25f88e631bd8170462d4f86c5a24 (diff)
downloadlinux-stable-bc972b6b52e2ddd93b7532cd2213d9c2be5d6340.tar.gz
linux-stable-bc972b6b52e2ddd93b7532cd2213d9c2be5d6340.tar.bz2
linux-stable-bc972b6b52e2ddd93b7532cd2213d9c2be5d6340.zip
ALSA: firewire: fix a memory leak bug
commit 1be3c1fae6c1e1f5bb982b255d2034034454527a upstream. In iso_packets_buffer_init(), 'b->packets' is allocated through kmalloc_array(). Then, the aligned packet size is checked. If it is larger than PAGE_SIZE, -EINVAL will be returned to indicate the error. However, the allocated 'b->packets' is not deallocated on this path, leading to a memory leak. To fix the above issue, free 'b->packets' before returning the error code. Fixes: 31ef9134eb52 ("ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver") Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: <stable@vger.kernel.org> # v2.6.39+ Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/firewire/packets-buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c
index 1ebf00c83409..715cd99f28de 100644
--- a/sound/firewire/packets-buffer.c
+++ b/sound/firewire/packets-buffer.c
@@ -37,7 +37,7 @@ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit,
packets_per_page = PAGE_SIZE / packet_size;
if (WARN_ON(!packets_per_page)) {
err = -EINVAL;
- goto error;
+ goto err_packets;
}
pages = DIV_ROUND_UP(count, packets_per_page);