summaryrefslogtreecommitdiffstats
path: root/drivers/message/i2o
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-08-11 03:02:03 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 17:59:05 +0200
commitd929dc2bfd8a58c34f1df0680018fa8ea5caa907 (patch)
tree4efe31c289c00b4ce00b30fce956df5401d6fdde /drivers/message/i2o
parentdrivers/message/i2o/exec-osm.c: add missing mutex_unlock (diff)
downloadlinux-d929dc2bfd8a58c34f1df0680018fa8ea5caa907.tar.xz
linux-d929dc2bfd8a58c34f1df0680018fa8ea5caa907.zip
i2o: fix overflow of copy_to_user()
If (len > reslen) we must not call copy_to_user() since kernel buffer is smaller than we want to copy. Similar code in this file is correct, so this bug was a typo. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/message/i2o')
-rw-r--r--drivers/message/i2o/i2o_config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index c4b117f5fb70..4dd39a03082a 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -115,7 +115,7 @@ static int i2o_cfg_gethrt(unsigned long arg)
put_user(len, kcmd.reslen);
if (len > reslen)
ret = -ENOBUFS;
- if (copy_to_user(kcmd.resbuf, (void *)hrt, len))
+ else if (copy_to_user(kcmd.resbuf, (void *)hrt, len))
ret = -EFAULT;
return ret;