From patchwork Thu Jan 29 18:55:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_Marjam=C3=A4ki?= X-Patchwork-Id: 21054 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 6FB8ADDF7F for ; Fri, 30 Jan 2009 05:56:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753732AbZA2S4P (ORCPT ); Thu, 29 Jan 2009 13:56:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752843AbZA2S4P (ORCPT ); Thu, 29 Jan 2009 13:56:15 -0500 Received: from ch-smtp01.sth.basefarm.net ([80.76.149.212]:45800 "EHLO ch-smtp01.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751500AbZA2S4O convert rfc822-to-8bit (ORCPT ); Thu, 29 Jan 2009 13:56:14 -0500 Received: from c83-255-10-24.bredband.comhem.se ([83.255.10.24]:12165 helo=sholahas.localnet) by ch-smtp01.sth.basefarm.net with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1LSc3f-00076w-5T for netdev@vger.kernel.org; Thu, 29 Jan 2009 19:56:12 +0100 From: Daniel =?iso-8859-1?q?Marjam=E4ki?= To: netdev@vger.kernel.org Subject: [PATCH] fix memory leak in drivers/net/netxen_nic_init.c Date: Thu, 29 Jan 2009 19:55:56 +0100 User-Agent: KMail/1.10.3 (Linux/2.6.27-9-generic; KDE/4.1.3; i686; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200901291955.56832.danielm77@spray.se> X-Originating-IP: 83.255.10.24 X-Authenticated: u11141105@ch-smtp01.sth.basefarm.net e61089262412aac4473c151e14de9ae1 X-Scan-Result: No virus found in message 1LSc3f-00076w-5T. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1LSc3f-00076w-5T f9c455598b1f7f565a530f8ee346e7d9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Marjamäki For kernel bugzilla #12537: http://bugzilla.kernel.org/show_bug.cgi?id=12537 Free memory. Signed-off-by: Daniel Marjamäki Reported-by: Daniel Marjamäki --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index ca7c8d8..ffd37be 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -947,8 +947,10 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose) } for (i = 0; i < n; i++) { if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || - netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0) + netxen_rom_fast_read(adapter, 8*i + 4*offset + 4, &addr) != 0) { + kfree(buf); return -EIO; + } buf[i].addr = addr; buf[i].data = val;