From patchwork Tue Jul 13 11:23:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58767 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 09681B6F1A for ; Tue, 13 Jul 2010 21:23:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755003Ab0GMLXe (ORCPT ); Tue, 13 Jul 2010 07:23:34 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:54679 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754822Ab0GMLXd (ORCPT ); Tue, 13 Jul 2010 07:23:33 -0400 Received: by mail-vw0-f46.google.com with SMTP id 5so5667886vws.19 for ; Tue, 13 Jul 2010 04:23: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=TyRKrju+mYBol/0iomEAGZzfLECFU9EzYfWP73L+npk=; b=v/0L82nDqpgbzL98D7IKjwk7X4X4aN+4AziOVrVqB9qnSv3ruBdps3F8CbBWvf4Kgw 1B17ZbCPPVMCZNmFH20k70kwy8KWGZch0YrIvVcju/WPFdHo8qi2sro5FfkxvJyRNXXr VJaZofHwIkh8vt68aLkpfT9bKRASDUUuxZ9U8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=vo7vMBXJ+N8KT/TsXYk4cR9Cz6tDujv3vEzd/5hFj4ZH7/aj0TZzqJ9pVQucFuX8D/ dERC8qqg3TAJsU6yTFXwNAY3YMd7q0pf7tIzRC06KEiDhLvt5dNn5xWSS6Hl0SZSijKL qP0U/uXdbOTCHA8oTsT1DykTuKprANcpPJ+mI= Received: by 10.220.124.21 with SMTP id s21mr7798349vcr.85.1279020212582; Tue, 13 Jul 2010 04:23:32 -0700 (PDT) Received: from localhost ([213.87.80.145]) by mx.google.com with ESMTPS id e1sm4886930vch.44.2010.07.13.04.23.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 13 Jul 2010 04:23:31 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: "David S. Miller" , Joe Perches , netdev@vger.kernel.org Subject: [PATCH] wd: fix memory leak Date: Tue, 13 Jul 2010 15:23:12 +0400 Message-Id: <1279020192-9484-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 Unmap mapped IO in wd_probe1() if register_netdev() failed. Signed-off-by: Kulikov Vasiliy --- drivers/net/wd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 746a5ee..eb72c67 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c @@ -358,8 +358,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) #endif err = register_netdev(dev); - if (err) + if (err) { free_irq(dev->irq, dev); + iounmap(ei_status.mem); + } return err; }