From patchwork Fri Jan 24 16:20:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3535321 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 389339F1C3 for ; Fri, 24 Jan 2014 16:21:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EDC42016C for ; Fri, 24 Jan 2014 16:21:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3328C20125 for ; Fri, 24 Jan 2014 16:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751852AbaAXQVI (ORCPT ); Fri, 24 Jan 2014 11:21:08 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:35266 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499AbaAXQVH (ORCPT ); Fri, 24 Jan 2014 11:21:07 -0500 Received: by mail-pd0-f180.google.com with SMTP id x10so3322714pdj.11 for ; Fri, 24 Jan 2014 08:21:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rVqsXRofQw5UwmjXxvm1aA4HWo+xyis+tisVme//euw=; b=EdBlfxnct2PG8Db1eFzOv+WRSSOzk0sQGWb6TFIhIlGGeHHzFDS+tCTzs3OxGZUAZD pOMLC+VHt7D+u5KVyH75Kbn4CgUzi74Eb20UHsrxIdBnRH5V8aTcCUIjLQbddtiplw57 +H87YyTsbXgh6zQtb2VGkevmfutz5K2/LUrcBZKbYw37f+QjeRGfAXZL0KXwEgVfm1hI KFaKbsk/VYlqg65FJ+VfdedUGxAGGTZXrmLzaT5l8nYeGBvNVtmJXXU9nzLnXblHWtH4 GsRlXQ7C9yGm92F/Qx4/afCCaQ2C1YvqWaKGlCfODw1x6xDzWjGOBfXWmaif9peBf5m6 gn1A== X-Gm-Message-State: ALoCoQkf9wEoCKDYE2mN5+0Lf+/M7szp79MauZAHAIbZ86yaY9OoYIdKfJ9QhLLeS4NwTyB6QMk1 X-Received: by 10.68.197.133 with SMTP id iu5mr15347538pbc.132.1390580464095; Fri, 24 Jan 2014 08:21:04 -0800 (PST) Received: from localhost ([39.181.43.174]) by mx.google.com with ESMTPSA id e6sm4561666pbg.4.2014.01.24.08.21.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:21:03 -0800 (PST) From: Hanjun Guo To: Lv Zheng , Robert Moore Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, devel@acpica.org, patches@linaro.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo , Yijing Wang Subject: [PATCH 2/2] ACPI / ACPICA: Fix potential memory leak in acpi_evaluate_object() Date: Sat, 25 Jan 2014 00:20:07 +0800 Message-Id: <1390580407-14525-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390580407-14525-1-git-send-email-hanjun.guo@linaro.org> References: <1390580407-14525-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is a potential memory leak when acpi_ut_copy_iobject_to_eobject() failed, because return_buffer was allocated in acpi_ut_initialize_buffer() when buffer type is ACPI_ALLOCATE_BUFFER or ACPI_ALLOCATE_LOCAL_BUFFER, and will not be freed outside when the return value is not AE_OK for acpi_evaluate_object(), fix it. Signed-off-by: Hanjun Guo Signed-off-by: Yijing Wang --- drivers/acpi/acpica/nsxfeval.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index a1b0b88..8ad792b 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c @@ -424,6 +424,11 @@ acpi_evaluate_object(acpi_handle handle, status = acpi_ut_copy_iobject_to_eobject( info->return_object, return_buffer); + if (ACPI_FAILURE(status) && + (buffer_space_needed == ACPI_ALLOCATE_BUFFER || + buffer_space_needed == ACPI_ALLOCATE_LOCAL_BUFFER)) { + ACPI_FREE(return_buffer); + } } }