]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ACPI: fix broken usage of acpi_ut_get_node_name()
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Tue, 24 Feb 2009 14:48:18 +0000 (11:48 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 17 Mar 2009 00:32:45 +0000 (17:32 -0700)
This issue was fixed indirectly in mainline by commit
60a4ce7f4148155d3f28eea4a213f7ee47cd57b7.

acpi_ut_get_node_name() returns a four char fixed-size array, not
NULL-terminated.

This is the minimal fix for stable 2.6.28.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: stable@kernel.org
Acked-by: Lin Ming <ming.m.lin@intel.com>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/acpi/power.c

index bb7d50dd28186d3c1d7e5d3d1bdb735aeab1944c..ad55db1899ac9a7dadca9cb821c6fee60619476e 100644 (file)
@@ -151,7 +151,7 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
        *state = (sta & 0x01)?ACPI_POWER_RESOURCE_STATE_ON:
                              ACPI_POWER_RESOURCE_STATE_OFF;
 
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%4.4s] is %s\n",
                          acpi_ut_get_node_name(handle),
                                *state ? "on" : "off"));