summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-12 22:48:59 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-24 03:17:21 +0200
commit05254a207a255e1a76f9b349a783b5016b874d72 (patch)
tree13d95f3956978e1e8e347be48b565cdf5b661c89 /drivers/char
parentip2: remove unneeded NULL check (diff)
downloadlinux-05254a207a255e1a76f9b349a783b5016b874d72.tar.xz
linux-05254a207a255e1a76f9b349a783b5016b874d72.zip
ip2: 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 on errors. Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: "Michael H. Warfield" <mhw@wittsend.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ip2/ip2main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 8fa041eb8440..d4b71e8d0d23 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -2930,6 +2930,8 @@ ip2_ipl_ioctl (struct file *pFile, UINT cmd, ULONG arg )
if ( pCh )
{
rc = copy_to_user(argp, pCh, sizeof(i2ChanStr));
+ if (rc)
+ rc = -EFAULT;
} else {
rc = -ENODEV;
}