From patchwork Tue Sep 25 07:01:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1502451 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6F058DF28C for ; Tue, 25 Sep 2012 07:01:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138Ab2IYHBL (ORCPT ); Tue, 25 Sep 2012 03:01:11 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:39943 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601Ab2IYHBK (ORCPT ); Tue, 25 Sep 2012 03:01:10 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q8P715gu030006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Sep 2012 07:01:05 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q8P714a6016403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Sep 2012 07:01:05 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q8P714jE014814; Tue, 25 Sep 2012 02:01:04 -0500 Received: from elgon.mountain (/41.212.103.53) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 25 Sep 2012 00:01:03 -0700 Date: Tue, 25 Sep 2012 10:01:03 +0300 From: Dan Carpenter To: Len Brown , Lan Tianyu Cc: linux-acpi@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] ACPI: free memory on an error path Message-ID: <20120925070103.GA23009@elgon.mountain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org We should free "physical_node" if before returning the error code. Signed-off-by: Dan Carpenter --- Only needed in linux-next. Introduced in 1033f9041d5 "ACPI: Allow ACPI binding with USB-3.0 hub". -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" 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/acpi/glue.c b/drivers/acpi/glue.c index d1a2d74..cfeecac 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -159,7 +159,7 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) if (physical_node->node_id >= ACPI_MAX_PHYSICAL_NODE) { retval = -ENOSPC; mutex_unlock(&acpi_dev->physical_node_lock); - goto err; + goto free_node; } set_bit(physical_node->node_id, acpi_dev->physical_node_id_bitmap); @@ -185,6 +185,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) return 0; +free_node: + kfree(physical_node); err: put_device(dev); return retval;