From 3ac5f7bc1d7aea9edbccd620c2f300660219d880 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Tue, 3 Aug 2010 12:52:55 +0200 Subject: [PATCH] --- yaml --- r: 208327 b: refs/heads/master c: f6c4c8e19a087dae7dc651ccbd1ff8b843eedee2 h: refs/heads/master i: 208325: 1f7872c92a9fa1f7d9cb9c3a0924c13574515a9b 208323: 48464444be58292e3f89b2ea8666d39e44178573 208319: ed6f948190fd0625473fea9012b92792063c1b7b v: v3 --- [refs] | 2 +- trunk/drivers/block/cpqarray.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3709f6382ec2..76332f2f0c9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08852b6d6c40f387f2b75e199e2ca1df68970f4c +refs/heads/master: f6c4c8e19a087dae7dc651ccbd1ff8b843eedee2 diff --git a/trunk/drivers/block/cpqarray.c b/trunk/drivers/block/cpqarray.c index 9473215956f9..d53b0291c44b 100644 --- a/trunk/drivers/block/cpqarray.c +++ b/trunk/drivers/block/cpqarray.c @@ -1179,7 +1179,8 @@ static int ida_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned in return error; case IDAGETCTLRSIG: if (!arg) return -EINVAL; - put_user(host->ctlr_sig, (int __user *)arg); + if (put_user(host->ctlr_sig, (int __user *)arg)) + return -EFAULT; return 0; case IDAREVALIDATEVOLS: if (MINOR(bdev->bd_dev) != 0) @@ -1187,7 +1188,8 @@ static int ida_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned in return revalidate_allvol(host); case IDADRIVERVERSION: if (!arg) return -EINVAL; - put_user(DRIVER_VERSION, (unsigned long __user *)arg); + if (put_user(DRIVER_VERSION, (unsigned long __user *)arg)) + return -EFAULT; return 0; case IDAGETPCIINFO: {