summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2008-11-13 10:54:39 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-06 13:47:24 -0800
commit723060e9421fb0bf065cfdd962df39a8daa450bb (patch)
tree256feb645be9092914da4259af75646bb4692062
parent1b3826f5b9b1b9e3e60300080834b8979e63bd94 (diff)
downloadlinux-stable-723060e9421fb0bf065cfdd962df39a8daa450bb.tar.gz
linux-stable-723060e9421fb0bf065cfdd962df39a8daa450bb.tar.bz2
linux-stable-723060e9421fb0bf065cfdd962df39a8daa450bb.zip
ACPICA: Allow multiple backslash prefix in namepaths
commit d037c5fd7367548191eab2b376a1d08c4ffaf7ff upstream. In a fully qualified namepath, allow multiple backslash prefixes. This can happen because of the use of a double-backslash in strings (since backslash is the escape character) causing confusion. ACPICA BZ 739 Lin Ming. http://www.acpica.org/bugzilla/show_bug.cgi?id=739 Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/acpi/namespace/nsutils.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index b0817e1127b1..337fb04e0388 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -314,9 +314,15 @@ void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
*
* strlen() + 1 covers the first name_seg, which has no path separator
*/
- if (acpi_ns_valid_root_prefix(next_external_char[0])) {
+ if (acpi_ns_valid_root_prefix(*next_external_char)) {
info->fully_qualified = TRUE;
next_external_char++;
+
+ /* Skip redundant root_prefix, like \\_SB.PCI0.SBRG.EC0 */
+
+ while (acpi_ns_valid_root_prefix(*next_external_char)) {
+ next_external_char++;
+ }
} else {
/*
* Handle Carat prefixes