From patchwork Thu Jul 12 09:00:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 1187601 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 87A5C40B37 for ; Thu, 12 Jul 2012 09:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933128Ab2GLJAk (ORCPT ); Thu, 12 Jul 2012 05:00:40 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49447 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932826Ab2GLJAe (ORCPT ); Thu, 12 Jul 2012 05:00:34 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id EF460A3D59; Thu, 12 Jul 2012 11:00:33 +0200 (CEST) From: Thomas Renninger Organization: SUSE Products GmbH To: "Rafael J. Wysocki" Subject: [PATCH] ACPICA: Fix possible fault in return package object repair code Date: Thu, 12 Jul 2012 11:00:30 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.37.6-0.11-desktop; KDE/4.6.0; x86_64; ; ) Cc: Linus Torvalds , Linux PM list , Len Brown , ACPI Devel Mailing List , Jonathan Nieder , Lin Ming , Bob Moore , Vlastimil Babka References: <201207111943.19405.rjw@sisk.pl> <201207121057.31791.trenn@suse.de> In-Reply-To: <201207121057.31791.trenn@suse.de> MIME-Version: 1.0 Message-Id: <201207121100.30579.trenn@suse.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Bob Moore Fixes a problem that can occur when a lone package object is wrapped with an outer package object in order to conform to the ACPI specification. Can affect these predefined names: _ALR,_MLS,_PSS,_TRT,_TSS,_PRT,_HPX,_DLM,_CSD,_PSD,_TSD https://bugzilla.kernel.org/show_bug.cgi?id=44171 The bug got introduce by commit 6a99b1c94d053b3420eaa4a4bc in v3.4-rc6, thus it needs to get pushed into 3.4 stable kernels as well. Reported-by: Vlastimil Babka Tested-by: Vlastimil Babka Tested-by: marc.collin@laboiteaprog.com Signed-off-by: Bob Moore Signed-off-by: Lin Ming CC: stable@vger.kernel.org --- drivers/acpi/acpica/nspredef.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 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/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c index 23ce096..fe66260 100644 --- a/drivers/acpi/acpica/nspredef.c +++ b/drivers/acpi/acpica/nspredef.c @@ -638,7 +638,7 @@ acpi_ns_check_package(struct acpi_predefined_data *data, /* Create the new outer package and populate it */ status = - acpi_ns_wrap_with_package(data, *elements, + acpi_ns_wrap_with_package(data, return_object, return_object_ptr); if (ACPI_FAILURE(status)) { return (status);