From: Greg KH on
2.6.33-stable review patch. If anyone has any objections, please let us know.


From: Dan Carpenter <error27(a)>

commit 18262714ca0fb65c290b8ea1807b2b02bb52d0e3 upstream.

acpi_device_class can only be 19 characters and a NULL terminator.

The current code has a buffer overflow in acpi_power_meter_add():
strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS);

Signed-off-by: Dan Carpenter <error27(a)>
Cc: Len Brown <lenb(a)>
Cc: "Darrick J. Wong" <djwong(a)>
Signed-off-by: Andrew Morton <akpm(a)>
Signed-off-by: Len Brown <len.brown(a)>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)>

drivers/acpi/power_meter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -34,7 +34,7 @@
#define ACPI_POWER_METER_NAME "power_meter"
-#define ACPI_POWER_METER_CLASS "power_meter_resource"
+#define ACPI_POWER_METER_CLASS "pwr_meter_resource"

#define NUM_SENSORS 17

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at