summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-11 22:41:36 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2012-04-13 13:42:15 +0200
commitae9a3405fd28ce05dc3d0b51d541fd5ec742b3b4 (patch)
tree7d6a5f2c899149a9b9af2e19611b3bfaebb8def0 /drivers/net
parentath6kl: Add AR6004 1.2 support for USB and SDIO (diff)
downloadlinux-ae9a3405fd28ce05dc3d0b51d541fd5ec742b3b4.tar.xz
linux-ae9a3405fd28ce05dc3d0b51d541fd5ec742b3b4.zip
ath6kl: fix memory leak in ath6kl_fwlog_block_read()
If, in drivers/net/wireless/ath/ath6kl/debug.c::ath6kl_fwlog_block_read(), the call to wait_for_completion_interruptible() returns -ERESTARTSYS then we'll return without freeing the (as yet unused) memory we allocated for 'buf' - thus leaking it. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath6kl/debug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 2bcd45095eb9..496382f472de 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -407,8 +407,10 @@ static ssize_t ath6kl_fwlog_block_read(struct file *file,
ret = wait_for_completion_interruptible(
&ar->debug.fwlog_completion);
- if (ret == -ERESTARTSYS)
+ if (ret == -ERESTARTSYS) {
+ vfree(buf);
return ret;
+ }
spin_lock(&ar->debug.fwlog_queue.lock);
}