From: Jens Axboe <axboe@suse.de>
Date: Fri, 18 Nov 2005 21:02:44 +0000 (+0100)
Subject: [PATCH 2/3] cciss: bug fix for BIG_PASS_THRU
X-Git-Tag: v2.6.15-rc2~17^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15534d3803993345d8db32246ec329d8f83502e1;p=linux-2.6

[PATCH 2/3] cciss: bug fix for BIG_PASS_THRU

Applications using CCISS_BIG_PASSTHRU complained that the data written
was zeros. The problem is that the buffer is being cleared after the
user copy, unless the user copy has failed... Correct that logic.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e239a6c292..33f8341887 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1017,10 +1017,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
 				status = -ENOMEM;
 				goto cleanup1;
 			}
-			if (ioc->Request.Type.Direction == XFER_WRITE &&
-				copy_from_user(buff[sg_used], data_ptr, sz)) {
+			if (ioc->Request.Type.Direction == XFER_WRITE) {
+				if (copy_from_user(buff[sg_used], data_ptr, sz)) {
 					status = -ENOMEM;
-					goto cleanup1;			
+					goto cleanup1;
+				}
 			} else {
 				memset(buff[sg_used], 0, sz);
 			}