From patchwork Tue Jul 13 19:49:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58813 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 100B3B6EEE for ; Wed, 14 Jul 2010 05:49:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757011Ab0GMTt3 (ORCPT ); Tue, 13 Jul 2010 15:49:29 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:56270 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753316Ab0GMTt2 (ORCPT ); Tue, 13 Jul 2010 15:49:28 -0400 Received: by ewy23 with SMTP id 23so1232563ewy.19 for ; Tue, 13 Jul 2010 12:49:26 -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:in-reply-to:references; bh=0SUicX39/M5vXW5x49r3RGKKGXK5VAL/qY/7cDDOVbY=; b=wA7YdWHG2kuDJvOzqQYZ/zOIw6T+mxoYVwwL0xRc3dXGKSsajOGS4rfKisA4y61H4O dW5T+dJXIH6LEoW8ifBTTAKVOCtRnAQe/+34ASIvfyEBvkZEOs9CDTceRofkPn5d9FCs nKgAK0+WOT8/4xfddztVHHZXV5s7smz452WhI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=IIH0NTr5Hr8be+CrunQASvx3ZcXcIRM8uXTUL6dXAK1FgDQjhKRMpQxhl0p5etm/5n IzqvNItMBxg6qQHn3++eO8/xYgT+mtKk4OZnLYkJ+1s3SgIOy8WSRIVNGQz4kix0mWm1 XVoo1PJaptfBmNN6SX/qnBHfeZKUPVoDlOy2o= Received: by 10.213.34.3 with SMTP id j3mr319285ebd.65.1279050566348; Tue, 13 Jul 2010 12:49:26 -0700 (PDT) Received: from localhost (ppp85-140-163-49.pppoe.mtu-net.ru [85.140.163.49]) by mx.google.com with ESMTPS id a48sm49909928eei.6.2010.07.13.12.49.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Jul 2010 12:49:25 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Mika Kuoppala , "David S. Miller" , Stephen Hemminger , Eric Dumazet , Tejun Heo , Jiri Pirko , netdev@vger.kernel.org Subject: [PATCH v2] eth16i: fix memory leak Date: Tue, 13 Jul 2010 23:49:23 +0400 Message-Id: <1279050563-15759-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <20100713114347.GK5658@bicker> References: <20100713114347.GK5658@bicker> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Free allocated netdev if no probe is expected. Signed-off-by: Kulikov Vasiliy --- drivers/net/eth16i.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 874973f..10e39f2 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -1442,8 +1442,10 @@ int __init init_module(void) dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]); if(io[this_dev] == 0) { - if(this_dev != 0) /* Only autoprobe 1st one */ + if (this_dev != 0) { /* Only autoprobe 1st one */ + free_netdev(dev); break; + } printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n"); }