Commit 9ed05c15 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: replace rtw_malloc/copy_from_user sequence with memdup_user 



memdup_user is shorter and expressively.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200412173716.846469-1-insafonov@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 823b6a95

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+6 −16
Original line number Diff line number Diff line
@@ -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: