2013-03-11 08:21:16

by Andrei Epure

[permalink] [raw]
Subject: [PATCH] acpi: replaced kmalloc+memcpy with kmemdup

Signed-off-by: Andrei Epure <[email protected]>
---
drivers/acpi/bus.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 01708a1..292de3c 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -288,13 +288,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
}
out_success:
context->ret.length = out_obj->buffer.length;
- context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
+ context->ret.pointer = kmemdup(out_obj->buffer.pointer,
+ context->ret.length, GFP_KERNEL);
if (!context->ret.pointer) {
status = AE_NO_MEMORY;
goto out_kfree;
}
- memcpy(context->ret.pointer, out_obj->buffer.pointer,
- context->ret.length);
status = AE_OK;

out_kfree:
--
1.7.9.5


2013-03-26 13:17:51

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] acpi: replaced kmalloc+memcpy with kmemdup

On Monday, March 11, 2013 10:20:16 AM Andrei Epure wrote:
> Signed-off-by: Andrei Epure <[email protected]>

Added a changelog and applied to linux-pm.git/linux-next.

Thanks,
Rafael


> ---
> drivers/acpi/bus.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 01708a1..292de3c 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -288,13 +288,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
> }
> out_success:
> context->ret.length = out_obj->buffer.length;
> - context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
> + context->ret.pointer = kmemdup(out_obj->buffer.pointer,
> + context->ret.length, GFP_KERNEL);
> if (!context->ret.pointer) {
> status = AE_NO_MEMORY;
> goto out_kfree;
> }
> - memcpy(context->ret.pointer, out_obj->buffer.pointer,
> - context->ret.length);
> status = AE_OK;
>
> out_kfree:
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.