aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-27 14:01:07 -0700
committerLen Brown <len.brown@intel.com>2010-05-06 02:38:24 -0400
commit18262714ca0fb65c290b8ea1807b2b02bb52d0e3 (patch)
treef308c99c76d01e4e5ff088099096011e2835b503
parenta40770a9537c72b555667851845e73484b22ba17 (diff)
downloadmrst-s0i3-test-18262714ca0fb65c290b8ea1807b2b02bb52d0e3.tar.gz
mrst-s0i3-test-18262714ca0fb65c290b8ea1807b2b02bb52d0e3.tar.xz
mrst-s0i3-test-18262714ca0fb65c290b8ea1807b2b02bb52d0e3.zip
power_meter: acpi_device_class "power_meter_resource" too long
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@gmail.com> Cc: Len Brown <lenb@kernel.org> Cc: "Darrick J. Wong" <djwong@us.ibm.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/power_meter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index e8c32a49f14..66f67293341 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -35,7 +35,7 @@
#define ACPI_POWER_METER_NAME "power_meter"
ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);
#define ACPI_POWER_METER_DEVICE_NAME "Power Meter"
-#define ACPI_POWER_METER_CLASS "power_meter_resource"
+#define ACPI_POWER_METER_CLASS "pwr_meter_resource"
#define NUM_SENSORS 17