Commit 1be3c1fa authored by Wenwen Wang's avatar Wenwen Wang Committed by Takashi Iwai

ALSA: firewire: fix a memory leak bug

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: 31ef9134 ("ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver")
Signed-off-by: default avatarWenwen Wang <wenwen@cs.uga.edu>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org> # v2.6.39+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c7cd7c74
...@@ -37,7 +37,7 @@ int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit, ...@@ -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; packets_per_page = PAGE_SIZE / packet_size;
if (WARN_ON(!packets_per_page)) { if (WARN_ON(!packets_per_page)) {
err = -EINVAL; err = -EINVAL;
goto error; goto err_packets;
} }
pages = DIV_ROUND_UP(count, packets_per_page); pages = DIV_ROUND_UP(count, packets_per_page);
......
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