From patchwork Wed Jan 6 16:54:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 42313 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 A1C7BB6EF7 for ; Thu, 7 Jan 2010 04:42:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932408Ab0AFRmo (ORCPT ); Wed, 6 Jan 2010 12:42:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755992Ab0AFRmo (ORCPT ); Wed, 6 Jan 2010 12:42:44 -0500 Received: from smtp.mujha-vel.cz ([81.30.225.246]:58409 "EHLO smtp.mujha-vel.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755808Ab0AFRmn (ORCPT ); Wed, 6 Jan 2010 12:42:43 -0500 Received: from [217.66.174.142] (helo=localhost.localdomain) by smtp.mujha-vel.cz with esmtp (Exim 4.63) (envelope-from ) id 1NSZ9G-000195-HM; Wed, 06 Jan 2010 17:54:18 +0100 From: Jiri Slaby To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, Jay Cliburn , Chris Snook , Jie Yang , atl1-devel@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH 1/1] NET: atlx, fix memory leak Date: Wed, 6 Jan 2010 17:54:16 +0100 Message-Id: <1262796856-21919-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.6.5.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stanse found a memory leak in atl2_get_eeprom. eeprom_buff is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby Cc: Jay Cliburn Cc: Chris Snook Cc: Jie Yang Cc: atl1-devel@lists.sourceforge.net Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- drivers/net/atlx/atl2.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index c0451d7..ec52529 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev, return -ENOMEM; for (i = first_dword; i < last_dword; i++) { - if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) - return -EIO; + if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) { + ret_val = -EIO; + goto free; + } } memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3), eeprom->len); +free: kfree(eeprom_buff); return ret_val;