From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun, 5 Sep 2010 18:32:33 +0000 (+0400)
Subject: staging: comedi: check return code of put_user
X-Git-Tag: v2.6.37-rc1~60^2~3^2~670
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=81604d43ade6abd316444f99ddb633f2e5a3f3eb;p=net-next-2.6.git

staging: comedi: check return code of put_user

Function put_user may fail. Check for it.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 14091313ceb..98fa255d862 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -537,7 +537,8 @@ static int do_chaninfo_ioctl(struct comedi_device *dev,
 
 			x = (dev->minor << 28) | (it.subdev << 24) | (i << 16) |
 			    (s->range_table_list[i]->length);
-			put_user(x, it.rangelist + i);
+			if (put_user(x, it.rangelist + i))
+				return -EFAULT;
 		}
 #if 0
 		if (copy_to_user(it.rangelist, s->range_type_list,