From patchwork Fri Jul 30 09:06:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 60341 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 317B0B6EFF for ; Fri, 30 Jul 2010 19:06:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755753Ab0G3JGh (ORCPT ); Fri, 30 Jul 2010 05:06:37 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:37043 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321Ab0G3JGg (ORCPT ); Fri, 30 Jul 2010 05:06:36 -0400 Received: by ewy23 with SMTP id 23so554179ewy.19 for ; Fri, 30 Jul 2010 02:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=eQGwv/zDG7mcXnU4wpMRA8Fhgc8aGQ/A0JlZtaHR+10=; b=f7NKy9bRhKa9b+Vcr5gS9yTYQIgVAHc3j8PdJ18QXFla6dOOibh0EskbDBxXCe4VYU UK3nxwKMzkCYTFKg6BXLPEC750ofVbzeVQV7Y9lkJNGNjXwGaAKRPmcR7QTC2zSj6Ig6 +Qsxram0jztnySS0HIzGvrqAB6XNTj8O5+/pY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=pvsQZ2Izo/IuX/W+Oe2XD5PP3vIuN0Zx4Qcx4V/4cXB2COAD69o5lsp0Dufd1cKgvt +p93Nyic56D8JDDJAeMGDGOKFnuE+fsHA7wMV6JvJKFH7mgpZEX1dAhs7ja6U4hvy75A Pj7HBoQqxzzeAsOTwrnu0jkcAfeVzbaV339ZI= Received: by 10.213.40.75 with SMTP id j11mr372644ebe.28.1280480794394; Fri, 30 Jul 2010 02:06:34 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id z55sm2777896eeh.15.2010.07.30.02.06.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 30 Jul 2010 02:06:33 -0700 (PDT) Date: Fri, 30 Jul 2010 11:06:04 +0200 From: Dan Carpenter To: Jaroslav Kysela Cc: "David S. Miller" , Jiri Pirko , Stephen Hemminger , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] hp100: unmap memory on error path Message-ID: <20100730090604.GY26313@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There was an error path where "mem_ptr_virt" didn't get unmapped. Signed-off-by: Dan Carpenter --- 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/hp100.c b/drivers/net/hp100.c index acbf0d0..ce587f4 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -720,9 +720,10 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, /* Conversion to new PCI API : * Pages are always aligned and zeroed, no need to it ourself. * Doc says should be OK for EISA bus as well - Jean II */ - if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) { + lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr); + if (!lp->page_vaddr_algn) { err = -ENOMEM; - goto out2; + goto out_mem_ptr; } lp->whatever_offset = ((u_long) page_baddr) - ((u_long) lp->page_vaddr_algn); @@ -798,6 +799,7 @@ out3: pci_free_consistent(lp->pci_dev, MAX_RINGSIZE + 0x0f, lp->page_vaddr_algn, virt_to_whatever(dev, lp->page_vaddr_algn)); +out_mem_ptr: if (mem_ptr_virt) iounmap(mem_ptr_virt); out2: