From patchwork Thu Jan 6 20:50:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 77801 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 B950BB6F07 for ; Fri, 7 Jan 2011 07:51:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753347Ab1AFUue (ORCPT ); Thu, 6 Jan 2011 15:50:34 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:16763 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589Ab1AFUua (ORCPT ); Thu, 6 Jan 2011 15:50:30 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 59E5C9403D; Thu, 6 Jan 2011 21:50:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 57E169403B; Thu, 6 Jan 2011 21:50:29 +0100 (CET) Date: Thu, 6 Jan 2011 21:50:29 +0100 (CET) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: netdev@vger.kernel.org, linux-hams@vger.kernel.org, Jean-Paul Roubelat , Frederic Rible , Thomas Sailer Subject: [PATCH] hamradio: Resolve memory leak due to missing firmware release in add_mcs() 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 Failure to release_firmware() in drivers/net/hamradio/yam.c::add_mcs() causes memory leak. This patch should fix it. Signed-off-by: Jesper Juhl --- yam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) compile tested only diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 4e7d1d0..7d9ced0 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -396,7 +396,7 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate, while (p) { if (p->bitrate == bitrate) { memcpy(p->bits, bits, YAM_FPGA_SIZE); - return p->bits; + goto out; } p = p->next; } @@ -411,7 +411,7 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate, p->bitrate = bitrate; p->next = yam_data; yam_data = p; - + out: release_firmware(fw); return p->bits; }