diff --git a/[refs] b/[refs] index ade82a9036d1..b6ae4fe3ca51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd420765eb48f052c627a934017f8e95fb011aef +refs/heads/master: 1aa5eb67d70fa1f801b8b988d7e48e264c283c5e diff --git a/trunk/drivers/staging/speakup/kobjects.c b/trunk/drivers/staging/speakup/kobjects.c index 07a7f5432597..2093896c546b 100644 --- a/trunk/drivers/staging/speakup/kobjects.c +++ b/trunk/drivers/staging/speakup/kobjects.c @@ -265,12 +265,11 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr, unsigned long flags; spk_lock(flags); - in_buff = kmalloc(count + 1, GFP_ATOMIC); + in_buff = kmemdup(buf, count + 1, GFP_ATOMIC); if (!in_buff) { spk_unlock(flags); return -ENOMEM; } - memcpy(in_buff, buf, count + 1); if (strchr("dDrR", *in_buff)) { set_key_info(key_defaults, key_buf); pr_info("keymap set to default values\n");