From 008f010d524891bb1f7b569c77b105e8fae21577 Mon Sep 17 00:00:00 2001 From: Xiaochen Wang Date: Sun, 6 Mar 2011 22:24:14 +0800 Subject: [PATCH] --- yaml --- r: 236303 b: refs/heads/master c: cd92274093876c57fa4de0f219a552911ef9adc6 h: refs/heads/master i: 236301: ed221540f612aea98ce471962b23f8415f5de9c7 236299: 7e2554f3ef5644cc3b5463b32854a80114c7ecf7 236295: 64ab60549a2f3d14716897a8ffca8ef16c2e135e 236287: f19aec51815d9ccf3aca4721ffea2117fe8f7d59 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d5a890f95ee8..2c61c96acdd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9603ff50b5d56e6ee64b10116ff640320732f9c8 +refs/heads/master: cd92274093876c57fa4de0f219a552911ef9adc6 diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 221be81c85eb..4ac17c0bbd59 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -1970,9 +1970,9 @@ static int r871x_wps_start(struct net_device *dev, struct _adapter *padapter = (struct _adapter *)_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; u32 u32wps_start = 0; - unsigned int uintRet = 0; - uintRet = copy_from_user((void *)&u32wps_start, pdata->pointer, 4); + if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4)) + return -EFAULT; if ((padapter->bDriverStopped) || (pdata == NULL)) return -EINVAL; if (u32wps_start == 0)