From patchwork Wed Apr 11 20:41:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151879 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3F013B7070 for ; Thu, 12 Apr 2012 06:41:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933193Ab2DKUli (ORCPT ); Wed, 11 Apr 2012 16:41:38 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:16761 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756803Ab2DKUlh (ORCPT ); Wed, 11 Apr 2012 16:41:37 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 38D6B9403D; Wed, 11 Apr 2012 22:41:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 370449403B; Wed, 11 Apr 2012 22:41:36 +0200 (CEST) Date: Wed, 11 Apr 2012 22:41:36 +0200 (CEST) From: Jesper Juhl To: linux-wireless@vger.kernel.org cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Love , "John W. Linville" , Kalle Valo Subject: [PATCH] ath6kl: fix memory leak in ath6kl_fwlog_block_read() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/wireless/ath/ath6kl/debug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c index d01403a..34eb927 100644 --- a/drivers/net/wireless/ath/ath6kl/debug.c +++ b/drivers/net/wireless/ath/ath6kl/debug.c @@ -401,8 +401,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); }