* [PATCH] ALSA: firewire: fix a memory leak bug
@ 2019-08-08 5:50 Wenwen Wang
2019-08-08 9:04 ` [alsa-devel] " Takashi Sakamoto
0 siblings, 1 reply; 3+ messages in thread
From: Wenwen Wang @ 2019-08-08 5:50 UTC (permalink / raw)
To: Wenwen Wang
Cc: Clemens Ladisch, Jaroslav Kysela, Takashi Iwai,
moderated list:FIREWIRE AUDIO DRIVERS, open list
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.
Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
---
sound/firewire/packets-buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c
index 0d35359..0ecafd0 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);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH] ALSA: firewire: fix a memory leak bug
2019-08-08 5:50 [PATCH] ALSA: firewire: fix a memory leak bug Wenwen Wang
@ 2019-08-08 9:04 ` Takashi Sakamoto
2019-08-08 9:12 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Sakamoto @ 2019-08-08 9:04 UTC (permalink / raw)
To: Wenwen Wang
Cc: open list, moderated list:FIREWIRE AUDIO DRIVERS,
Clemens Ladisch, Takashi Iwai
Hi,
On Thu, Aug 8, 2019, at 14:53, Wenwen Wang wrote:
> 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.
>
> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> ---
> sound/firewire/packets-buffer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
And this bug exists till its first commit for v2.6.39.
Fixes: 31ef9134eb52 ("ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver")
Cc: <stable@vger.kernel.org> # v2.6.39+
Thanks
Takashi Sakamoto
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH] ALSA: firewire: fix a memory leak bug
2019-08-08 9:04 ` [alsa-devel] " Takashi Sakamoto
@ 2019-08-08 9:12 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2019-08-08 9:12 UTC (permalink / raw)
To: Takashi Sakamoto
Cc: Wenwen Wang, moderated list:FIREWIRE AUDIO DRIVERS,
Clemens Ladisch, Takashi Iwai, open list
On Thu, 08 Aug 2019 11:04:03 +0200,
Takashi Sakamoto wrote:
>
> Hi,
>
> On Thu, Aug 8, 2019, at 14:53, Wenwen Wang wrote:
> > 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.
> >
> > Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> > ---
> > sound/firewire/packets-buffer.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
>
> And this bug exists till its first commit for v2.6.39.
>
> Fixes: 31ef9134eb52 ("ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver")
> Cc: <stable@vger.kernel.org> # v2.6.39+
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-08 9:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-08 5:50 [PATCH] ALSA: firewire: fix a memory leak bug Wenwen Wang
2019-08-08 9:04 ` [alsa-devel] " Takashi Sakamoto
2019-08-08 9:12 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).