aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-06-04 12:39:51 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-04 13:38:58 -0700
commit2d98bb22c33b033182edd3a3c6b4c4e1d091db4d (patch)
tree9e8995b79993fc279383ee713ee6f9fbb7d5642d /drivers
parentStaging: Eliminate a NULL pointer dereference (diff)
downloadlinux-dev-2d98bb22c33b033182edd3a3c6b4c4e1d091db4d.tar.xz
linux-dev-2d98bb22c33b033182edd3a3c6b4c4e1d091db4d.zip
Staging: rc2860: return -EFAULT on copy_to_user errors
copy_to_user() returns the number of bytes remaining but we want to return a negative error code. This is in the ioctl handler and the error code gets passed to userspace. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 112da7a6c417..6b8268d3dc75 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
Status =
copy_to_user(erq->pointer, pAd->nickname,
erq->length);
+ if (Status)
+ Status = -EFAULT;
break;
}
case SIOCGIWRATE: /*get default bit rate (bps) */