From patchwork Sat Jul 3 15:20:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 57811 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 E2E77B6F1A for ; Sun, 4 Jul 2010 01:21:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753581Ab0GCPUt (ORCPT ); Sat, 3 Jul 2010 11:20:49 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:41513 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752715Ab0GCPUp (ORCPT ); Sat, 3 Jul 2010 11:20:45 -0400 Received: by mail-ew0-f46.google.com with SMTP id 23so1280157ewy.19 for ; Sat, 03 Jul 2010 08:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=z8r29NMaAB3PyeMGOHLdJ5qZtzmRBFEVzxAbvpE1NHo=; b=HVYyNGB7/DLsHa2yvJ59rJOMEIaGC/MDoBcV4RiP1VcR9LBU2bjQo5syTxx1rnqctl +1EpsaDSmDtq3qRtaQww1ip96DzhicDzsa0hr+o181cNTZSladAeCvoSCpKI7VyHCDCx EuE5pFyRKWlRDU7mO0Keyi4PLMVf3/3bC5LU4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=oAhWqUiSfZt53hlvIBxQYmcrlZDJAGeWKrvaGXEyLZxX2vY/V0JY0uO4YxFBRDsd/e gp+ux6TOgTmy6xQic7Rcd4m0vlh3IxtKwKrldS17z1gbsuXO2078uf4suBKPC1SYrE6C wdecwvQjGqw2Fgju95pWRzTJ+9RTPH4Uofotk= Received: by 10.213.14.81 with SMTP id f17mr331061eba.33.1278170444850; Sat, 03 Jul 2010 08:20:44 -0700 (PDT) Received: from localhost (ppp91-77-43-224.pppoe.mtu-net.ru [91.77.43.224]) by mx.google.com with ESMTPS id z55sm16281097eeh.15.2010.07.03.08.20.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 03 Jul 2010 08:20:44 -0700 (PDT) From: Kulikov Vasiliy To: Kernel Janitors Cc: "David S. Miller" , Joe Perches , Atsushi Nemoto , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/ne: fix memory leak in ne_drv_probe() Date: Sat, 3 Jul 2010 19:20:42 +0400 Message-Id: <1278170444-8170-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net_device allocated with alloc_eip_netdev() must be freed. Signed-off-by: Kulikov Vasiliy --- drivers/net/ne.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/ne.c b/drivers/net/ne.c index b8e2923..1063093 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -796,28 +796,30 @@ static int __init ne_drv_probe(struct platform_device *pdev) dev = alloc_eip_netdev(); if (!dev) return -ENOMEM; /* ne.c doesn't populate resources in platform_device, but * rbtx4927_ne_init and rbtx4938_ne_init do register devices * with resources. */ res = platform_get_resource(pdev, IORESOURCE_IO, 0); if (res) { dev->base_addr = res->start; dev->irq = platform_get_irq(pdev, 0); } else { - if (this_dev < 0 || this_dev >= MAX_NE_CARDS) + if (this_dev < 0 || this_dev >= MAX_NE_CARDS) { + free_netdev(dev); return -EINVAL; + } dev->base_addr = io[this_dev]; dev->irq = irq[this_dev]; dev->mem_end = bad[this_dev]; } err = do_ne_probe(dev); if (err) { free_netdev(dev); return err; } platform_set_drvdata(pdev, dev); /* Update with any values found by probing, don't update if * resources were specified.