From 9ca9b9c6cf3499ea1b70164d1cda414df71bda86 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Wed, 31 Oct 2012 02:28:19 +0000 Subject: [PATCH] --- yaml --- r: 336658 b: refs/heads/master c: 47abd13ccfa140ad34620b343bf0e6eca15ed8e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/nsutils.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af102c28ff10..4049d9e7dccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97171c6be3088a68b403c7285d34c151f7dbfb18 +refs/heads/master: 47abd13ccfa140ad34620b343bf0e6eca15ed8e8 diff --git a/trunk/drivers/acpi/acpica/nsutils.c b/trunk/drivers/acpi/acpica/nsutils.c index 0d3d481ce58e..b5b4cb72a8a8 100644 --- a/trunk/drivers/acpi/acpica/nsutils.c +++ b/trunk/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;