From patchwork Sat Jul 10 12:28:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58479 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 D847FB6F0E for ; Sat, 10 Jul 2010 22:34:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754795Ab0GJMef (ORCPT ); Sat, 10 Jul 2010 08:34:35 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:48162 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403Ab0GJMed (ORCPT ); Sat, 10 Jul 2010 08:34:33 -0400 Received: by gye5 with SMTP id 5so1837852gye.19 for ; Sat, 10 Jul 2010 05:34:32 -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=wuEW7X1a4Yc9Sz18zRogYUcdbAKG9gmx1WYdaHjewU8=; b=VfSI4U8eACtiBqW0xf8K8fgd6zfn7a3XW7TqOu1VdZ5vDy0NXqPwydH7jZqC/67O7S w+m4tYpxs0M8RaASsVPCR2BNcD8Qiioi2Eo0qu3ItKFpGYPCAiMSrjOJcuJMBs7abTms NRycJqS5qJzIBj+h8kQT1ZZ3ZIWzZAVr6Ms0o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=SmzuS93lVhOSIu/fX7uUK6Asspp21dEA1CVh486DV6qGTHZRiTzC/pjQyXTt5pqXvs 6MmOBmnMk0sZV34Ib4SGiBJ9/feCOO2YS1J53D4atjnqOg/HLB3FmMVqXjVDKweIXmZT WEnVfMeYkB1w17aPU3iREckaF8PQ8FJwtmx9U= Received: by 10.229.88.147 with SMTP id a19mr6864787qcm.1.1278764959922; Sat, 10 Jul 2010 05:29:19 -0700 (PDT) Received: from localhost ([213.87.80.1]) by mx.google.com with ESMTPS id q30sm9035693qcq.36.2010.07.10.05.29.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 10 Jul 2010 05:29:18 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Michael Wu , "John W. Linville" , "David S. Miller" , Johannes Berg , Kalle Valo , "Luis R. Rodriguez" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] adm8211: fix memory leak Date: Sat, 10 Jul 2010 16:28:57 +0400 Message-Id: <1278764938-9417-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 We must free priv->eeprom allocated in adm8211_read_eeprom(). Signed-off-by: Kulikov Vasiliy Acked-by: Luis R. Rodriguez --- drivers/net/wireless/adm8211.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 880ad9d..bde2fa8 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c @@ -1903,7 +1903,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, if (err) { printk(KERN_ERR "%s (adm8211): Cannot register device\n", pci_name(pdev)); - goto err_free_desc; + goto err_free_eeprom; } printk(KERN_INFO "%s: hwaddr %pM, Rev 0x%02x\n", @@ -1912,6 +1912,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, return 0; + err_free_eeprom: + kfree(priv->eeprom); + err_free_desc: pci_free_consistent(pdev, sizeof(struct adm8211_desc) * priv->rx_ring_size +