---

yaml --- r: 208327 b: refs/heads/master c: f6c4c8e h: refs/heads/master i: 208325: 1f7872c 208323: 4846444 208319: ed6f948 v: v3
git-mirror · Aug 7, 2010 · 3ac5f7b · 3ac5f7b
1 parent edf1443
commit 3ac5f7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -1179,15 +1179,17 @@ 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)
 			return -ENXIO;
 		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:
 	{