From e6664414ad988b7f53eee1f7fecc18fbd5b445fb Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 15 Sep 2006 14:43:11 +0200
Subject: [PATCH] --- yaml --- r: 35052 b: refs/heads/master c:
 2d2f8d59b14bec6c745e219a350ac51d9e00673f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/megaraid.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 560eaf8c6e68..93ec62d5f0c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fcda4224529c4e550c917668d5e96c1d3e7039b
+refs/heads/master: 2d2f8d59b14bec6c745e219a350ac51d9e00673f
diff --git a/trunk/drivers/scsi/megaraid.c b/trunk/drivers/scsi/megaraid.c
index ccb0055ac73a..b87bef69ba0f 100644
--- a/trunk/drivers/scsi/megaraid.c
+++ b/trunk/drivers/scsi/megaraid.c
@@ -3656,8 +3656,9 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
 			 * Send the request sense data also, irrespective of
 			 * whether the user has asked for it or not.
 			 */
-			copy_to_user(upthru->reqsensearea,
-					pthru->reqsensearea, 14);
+			if (copy_to_user(upthru->reqsensearea,
+					pthru->reqsensearea, 14))
+				rval = -EFAULT;
 
 freemem_and_return:
 			if( pthru->dataxferlen ) {