From 2146f87b923f18b00ce139c933e2e047c14dd183 Mon Sep 17 00:00:00 2001 From: Andrei Epure Date: Mon, 11 Mar 2013 08:20:16 +0000 Subject: [PATCH] --- yaml --- r: 367598 b: refs/heads/master c: e2cb5f08469c991b187f66fa627d7673c7f3361b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/bus.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2f4228d8fbec..2194d19765bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82160dd8ba4db5674d1d6730afe8d9b499fb7a4a +refs/heads/master: e2cb5f08469c991b187f66fa627d7673c7f3361b diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c index 01708a165368..292de3cab9cc 100644 --- a/trunk/drivers/acpi/bus.c +++ b/trunk/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: