Pull bugzilla-5452 into release branch

[pandora-kernel.git] / drivers / acpi / hotkey.c

diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index 2e2e405..c25b2b9 100644 (file)
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -723,6 +723,8 @@ get_parms(char *config_record,
                goto do_fail;
        count = tmp1 - tmp;
        *action_handle = (char *)kmalloc(count + 1, GFP_KERNEL);
+       if (!*action_handle)
+               goto do_fail;
        strncpy(*action_handle, tmp, count);
        *(*action_handle + count) = 0;