From: Bob Moore <robert.moore@intel.com>
Date: Wed, 31 Oct 2012 02:28:19 +0000 (+0000)
Subject: ACPICA: Fix externalize name to complete migration to ACPI_MOVE_NAME
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47abd13ccfa140ad34620b343bf0e6eca15ed8e8;p=linux-beck.git

ACPICA: Fix externalize name to complete migration to ACPI_MOVE_NAME

Fix for name segment copy and validation.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 0d3d481ce58e..b5b4cb72a8a8 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -557,8 +557,11 @@ acpi_ns_externalize_name(u32 internal_name_length,
 				(*converted_name)[j++] = '.';
 			}
 
-			ACPI_MOVE_NAME(*converted_name, internal_name);
-			acpi_ut_repair_name(*converted_name);
+			/* Copy and validate the 4-char name segment */
+
+			ACPI_MOVE_NAME(&(*converted_name)[j],
+				       &internal_name[names_index]);
+			acpi_ut_repair_name(&(*converted_name)[j]);
 
 			j += ACPI_NAME_SIZE;
 			names_index += ACPI_NAME_SIZE;