* [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long
@ 2010-04-27 21:01 akpm
2010-04-28 17:25 ` Darrick J. Wong
2010-04-29 1:06 ` Len Brown
0 siblings, 2 replies; 3+ messages in thread
From: akpm @ 2010-04-27 21:01 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, akpm, error27, djwong, stable
From: Dan Carpenter <error27@gmail.com>
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>
---
drivers/acpi/power_meter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long drivers/acpi/power_meter.c
--- a/drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long
+++ a/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
_
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long
2010-04-27 21:01 [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long akpm
@ 2010-04-28 17:25 ` Darrick J. Wong
2010-04-29 1:06 ` Len Brown
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2010-04-28 17:25 UTC (permalink / raw)
To: akpm; +Cc: lenb, linux-acpi, error27, stable
On Tue, Apr 27, 2010 at 02:01:07PM -0700, akpm@linux-foundation.org wrote:
> From: Dan Carpenter <error27@gmail.com>
>
> 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>
Looks ok to me, so:
Acked-by: Darrick J. Wong <djwong@us.ibm.com>
> ---
>
> drivers/acpi/power_meter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff -puN drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long drivers/acpi/power_meter.c
> --- a/drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long
> +++ a/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
>
> _
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long
2010-04-27 21:01 [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long akpm
2010-04-28 17:25 ` Darrick J. Wong
@ 2010-04-29 1:06 ` Len Brown
1 sibling, 0 replies; 3+ messages in thread
From: Len Brown @ 2010-04-29 1:06 UTC (permalink / raw)
To: akpm; +Cc: linux-acpi, error27, djwong, stable
applied
thanks,
Len Brown, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-01 1:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-27 21:01 [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long akpm
2010-04-28 17:25 ` Darrick J. Wong
2010-04-29 1:06 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox