| From 18262714ca0fb65c290b8ea1807b2b02bb52d0e3 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <error27@gmail.com> |
| Date: Tue, 27 Apr 2010 14:01:07 -0700 |
| Subject: power_meter: acpi_device_class "power_meter_resource" too long |
| |
| From: Dan Carpenter <error27@gmail.com> |
| |
| 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@gmail.com> |
| Cc: Len Brown <lenb@kernel.org> |
| Cc: "Darrick J. Wong" <djwong@us.ibm.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| 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" |
| 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 |
| |
