Messages in this thread Patch in this message |  | | | Date | Tue, 13 Dec 2005 00:23:59 -0800 | | From | Greg KH <> | | Subject | [patch 25/26] cciss: bug fix for BIG_PASS_THRU |
-stable review patch. If anyone has any objections, please let us know.
------------------ From: Jens Axboe <axboe@suse.de> 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e239a6c..33f8341 100644 --- drivers/block/cciss.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- linux-2.6.14.3.orig/drivers/block/cciss.c +++ linux-2.6.14.3/drivers/block/cciss.c @@ -1016,10 +1016,11 @@ static int cciss_ioctl(struct inode *ino 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); } -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |