diff options
| author | Wenwen Wang <wenwen@cs.uga.edu> | 2019-08-08 00:50:58 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 10:51:38 +0200 |
| commit | dbb4f2d59f392634019e0ff91280fc67434cf9da (patch) | |
| tree | a5ba7efda5cd3125f59b89d5e8bb2a969ffbf0d3 /sound | |
| parent | d3d1b67ffdd76eb118290e6d2f9733798816c67f (diff) | |
| download | linux-stable-dbb4f2d59f392634019e0ff91280fc67434cf9da.tar.gz linux-stable-dbb4f2d59f392634019e0ff91280fc67434cf9da.tar.bz2 linux-stable-dbb4f2d59f392634019e0ff91280fc67434cf9da.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c index ea1506679c66..3b09b8ef3a09 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); |