From patchwork Thu Jan 6 21:06:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 77802 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 02A15B7106 for ; Fri, 7 Jan 2011 08:07:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753592Ab1AFVGj (ORCPT ); Thu, 6 Jan 2011 16:06:39 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:17011 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652Ab1AFVGi (ORCPT ); Thu, 6 Jan 2011 16:06:38 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id BFEB59403D; Thu, 6 Jan 2011 22:06:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id BD9E59403B; Thu, 6 Jan 2011 22:06:37 +0100 (CET) Date: Thu, 6 Jan 2011 22:06:37 +0100 (CET) From: Jesper Juhl To: linux-atm-general@lists.sourceforge.net cc: Chas Williams , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory. 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 call release_firmware() will result in memory leak in drivers/atm/ambassador.c::ucode_init(). This patch makes sure we always call release_firmware() when needed, thus removing the leak(s). Signed-off-by: Jesper Juhl --- ambassador.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Compile tested only since I have no way to actually test this. diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index ffe9b65..ab56539 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -1927,7 +1927,7 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) { unsigned long start_address; const struct ihex_binrec *rec; int res; - + res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev); if (res) { PRINTK (KERN_ERR, "Cannot load microcode data"); @@ -1937,6 +1937,7 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) { /* First record contains just the start address */ rec = (const struct ihex_binrec *)fw->data; if (be16_to_cpu(rec->len) != sizeof(__be32) || be32_to_cpu(rec->addr)) { + release_firmware(fw); PRINTK (KERN_ERR, "Bad microcode data (no start record)"); return -EINVAL; } @@ -1950,10 +1951,12 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) { PRINTD (DBG_LOAD, "starting region (%x, %u)", be32_to_cpu(rec->addr), be16_to_cpu(rec->len)); if (be16_to_cpu(rec->len) > 4 * MAX_TRANSFER_DATA) { + release_firmware(fw); PRINTK (KERN_ERR, "Bad microcode data (record too long)"); return -EINVAL; } if (be16_to_cpu(rec->len) & 3) { + release_firmware(fw); PRINTK (KERN_ERR, "Bad microcode data (odd number of bytes)"); return -EINVAL; }