From aa883e06225b3e8be3b85e1753216c00f202da50 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 5 Sep 2010 22:32:33 +0400 Subject: [PATCH] --- yaml --- r: 219777 b: refs/heads/master c: 81604d43ade6abd316444f99ddb633f2e5a3f3eb h: refs/heads/master i: 219775: 9137fd048ea7fbd2f183a30db87a99fa73aacc9f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 398f3904c0e1..483ea5c13fea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b04462a143afde542ad9e5a1df4fcfbff6d30249 +refs/heads/master: 81604d43ade6abd316444f99ddb633f2e5a3f3eb diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 14091313cebb..98fa255d862e 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/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,