add scsi SG_IO fix

diff --git a/queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch b/queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch
new file mode 100644 (file)
index 0000000..f9b926e
--- /dev/null
+++ b/queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch
@@ -0,0 +1,53 @@
+From stable-bounces@linux.kernel.org  Thu Nov 16 01:23:55 2006
+Message-Id: <200611160919.kAG9JVas018776@shell0.pdx.osdl.net>
+To: torvalds@osdl.org
+From: akpm@osdl.org
+Date: Thu, 16 Nov 2006 01:19:31 -0800
+Cc: akpm@osdl.org, James.Bottomley@steeleye.com, htejun@gmail.com, dougg@torque.net, jens.axboe@oracle.com, mfluhr@nero.com, jgarzik@pobox.com, stable@kernel.org
+Subject: scsi: clear garbage after CDBs on SG_IO
+
+From: Tejun Heo <htejun@gmail.com>
+
+ATAPI devices transfer fixed number of bytes for CDBs (12 or 16).  Some
+ATAPI devices choke when shorter CDB is used and the left bytes contain
+garbage.  Block SG_IO cleared left bytes but SCSI SG_IO didn't.  This patch
+makes SCSI SG_IO clear it and simplify CDB clearing in block SG_IO.
+
+Signed-off-by: Tejun Heo <htejun@gmail.com>
+Cc: Mathieu Fluhr <mfluhr@nero.com>
+Cc: James Bottomley <James.Bottomley@steeleye.com>
+Cc: Douglas Gilbert <dougg@torque.net>
+Acked-by: Jens Axboe <jens.axboe@oracle.com>
+Cc: <stable@kernel.org>
+Acked-by: Jeff Garzik <jgarzik@pobox.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ block/scsi_ioctl.c      |    3 +--
+ drivers/scsi/scsi_lib.c |    1 +
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.3.orig/block/scsi_ioctl.c
++++ linux-2.6.18.3/block/scsi_ioctl.c
+@@ -286,9 +286,8 @@ static int sg_io(struct file *file, requ
+        * fill in request structure
+        */
+       rq->cmd_len = hdr->cmd_len;
++      memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
+       memcpy(rq->cmd, cmd, hdr->cmd_len);
+-      if (sizeof(rq->cmd) != hdr->cmd_len)
+-              memset(rq->cmd + hdr->cmd_len, 0, sizeof(rq->cmd) - hdr->cmd_len);
+ 
+       memset(sense, 0, sizeof(sense));
+       rq->sense = sense;
+--- linux-2.6.18.3.orig/drivers/scsi/scsi_lib.c
++++ linux-2.6.18.3/drivers/scsi/scsi_lib.c
+@@ -408,6 +408,7 @@ int scsi_execute_async(struct scsi_devic
+               goto free_req;
+ 
+       req->cmd_len = cmd_len;
++      memset(req->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
+       memcpy(req->cmd, cmd, req->cmd_len);
+       req->sense = sioc->sense;
+       req->sense_len = 0;

diff --git a/queue-2.6.18/series b/queue-2.6.18/series
index 7105f8a0fdd8f3317f02abd231b269aae6dc8426..d920557bf5b10e624532c7088c30f344a12c5bd7 100644 (file)
--- a/queue-2.6.18/series
+++ b/queue-2.6.18/series
@@ -1,3 +1,4 @@
+scsi-clear-garbage-after-cdbs-on-sg_io.patch
 netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch
 netfilter-ip_tables-compat-error-way-cleanup.patch
 netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch