staging: r8188eu: replace rtw_malloc/copy_from_user sequence with memdup_user
authorIvan Safonov <insafonov@gmail.com>
Sun, 12 Apr 2020 17:37:16 +0000 (20:37 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Apr 2020 12:57:51 +0000 (14:57 +0200)
memdup_user is shorter and expressively.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200412173716.846469-1-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

index 0aff01bb69c3c50d4a7e8f56f1bcb2476d8b3f1e..d5968ef9f43d73ae15ff85adcb3b46c0c1552662 100644 (file)
@@ -2012,14 +2012,9 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)
        if (!p->pointer || p->length != sizeof(struct ieee_param))
                return -EINVAL;
 
-       param = (struct ieee_param *)rtw_malloc(p->length);
-       if (!param)
-               return -ENOMEM;
-
-       if (copy_from_user(param, p->pointer, p->length)) {
-               kfree(param);
-               return -EFAULT;
-       }
+       param = memdup_user(p->pointer, p->length);
+       if (IS_ERR(param))
+               return PTR_ERR(param);
 
        switch (param->cmd) {
        case IEEE_CMD_SET_WPA_PARAM:
@@ -2789,14 +2784,9 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
        if (!p->pointer || p->length != sizeof(struct ieee_param))
                return -EINVAL;
 
-       param = (struct ieee_param *)rtw_malloc(p->length);
-       if (!param)
-               return -ENOMEM;
-
-       if (copy_from_user(param, p->pointer, p->length)) {
-               kfree(param);
-               return -EFAULT;
-       }
+       param = memdup_user(p->pointer, p->length);
+       if (IS_ERR(param))
+               return PTR_ERR(param);
 
        switch (param->cmd) {
        case RTL871X_HOSTAPD_FLUSH: