From patchwork Wed Jul 4 02:02:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 1153731 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 CDFEFDFFAD for ; Wed, 4 Jul 2012 02:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932785Ab2GDCCf (ORCPT ); Tue, 3 Jul 2012 22:02:35 -0400 Received: from mga02.intel.com ([134.134.136.20]:57987 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932541Ab2GDCCe (ORCPT ); Tue, 3 Jul 2012 22:02:34 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 03 Jul 2012 19:02:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="161186142" Received: from hp6530s.sh.intel.com (HELO [10.239.36.45]) ([10.239.36.45]) by orsmga001.jf.intel.com with ESMTP; 03 Jul 2012 19:02:33 -0700 Subject: [PATCH] ACPICA: Fix possible fault in return package object repair code From: Lin Ming To: lenb Cc: Bob Moore , Vlastimil Babka , linux-acpi Date: Wed, 04 Jul 2012 10:02:32 +0800 Message-ID: <1341367352.3978.2.camel@minggr> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 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 Reported-by: Vlastimil Babka Signed-off-by: Bob Moore Signed-off-by: Lin Ming --- Len, This is an important bug fix. Could you merge it? drivers/acpi/acpica/nspredef.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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);