From: Irwan Djajadi Signed-off-by: Irwan Djajadi Signed-off-by: Alexey Dobriyan Cc: "Brown, Len" Signed-off-by: Andrew Morton --- drivers/acpi/hotkey.c | 2 ++ 1 files changed, 2 insertions(+) diff -puN drivers/acpi/hotkey.c~drivers-acpi-hotkeyc-check-kmalloc-return-value drivers/acpi/hotkey.c --- devel/drivers/acpi/hotkey.c~drivers-acpi-hotkeyc-check-kmalloc-return-value 2006-01-22 02:57:39.000000000 -0800 +++ devel-akpm/drivers/acpi/hotkey.c 2006-01-22 02:57:39.000000000 -0800 @@ -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; _