OSDN Git Service

staging: wilc1000: replace kmalloc/memcpy with kmemdup
authorChaehyun Lim <chaehyun.lim@gmail.com>
Tue, 27 Oct 2015 11:40:37 +0000 (20:40 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Oct 2015 23:49:50 +0000 (08:49 +0900)
This patch replaces kmalloc followed by memcpy with kmemdup.
It is also added error checking of kmemdup.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index af98c43..28fef25 100644 (file)
@@ -3124,8 +3124,10 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,
        msg.body.key_info.type = WEP;
        msg.body.key_info.action = ADDKEY;
        msg.drv = hif_drv;
-       msg.body.key_info.attr.wep.key = kmalloc(len, GFP_KERNEL);
-       memcpy(msg.body.key_info.attr.wep.key, key, len);
+       msg.body.key_info.attr.wep.key = kmemdup(key, len, GFP_KERNEL);
+       if (!msg.body.key_info.attr.wep.key)
+               return -ENOMEM;
+
        msg.body.key_info.attr.wep.key_len = len;
        msg.body.key_info.attr.wep.index = index;