[PATCH 1/2] staging: wilc1000: use memdup_user

Gujulan Elango, Hari Prasath (H.) hgujulan at visteon.com
Thu Jun 11 07:48:13 UTC 2015


From: Hari Prasath Gujulan Elango <hgujulan at visteon.com>

This patch replaces the kmalloc followed by copy_from_user by the
wrapper routine memdup_user.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan at visteon.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index e92ba59..173b958 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -2459,16 +2459,10 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 		size = wrq->u.data.length;
 
 		if (size && wrq->u.data.pointer) {
-			buff = kmalloc(size, GFP_KERNEL);
-			if (!buff) {
-				s32Error = -ENOMEM;
-				goto done;
-			}
 
-			if (copy_from_user
-				    (buff, wrq->u.data.pointer,
-				    wrq->u.data.length)) {
-				s32Error = -EFAULT;
+			buff = memdup_user(wrq->u.data.pointer, wrq->u.data.length);
+			if (IS_ERR(buff)) {
+				s32Error = PTR_ERR(buff);
 				goto done;
 			}
 
-- 
1.9.1


More information about the devel mailing list