]> git.hungrycats.org Git - linux/commitdiff
scsi: Avoid crashing if device uses DIX but adapter does not support it
authorEwan D. Milne <emilne@redhat.com>
Thu, 15 Jan 2015 15:02:12 +0000 (10:02 -0500)
committerJiri Slaby <jslaby@suse.cz>
Tue, 3 May 2016 15:42:13 +0000 (17:42 +0200)
commit 91724c20613484555ba7e7b3d8549dac1e24f7a8 upstream.

This can happen if a multipathed device uses DIX and another path is
added via an adapter that does not support it.  Multipath should not
allow this path to be added, but we should not depend upon that to avoid
crashing.

Signed-off-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/scsi/scsi_lib.c

index 0c6a2660d1d5785c472fdb26042c6b0dfe1d16cc..2b01c88ad416ca4f77458749a5a4324cbe1df484 100644 (file)
@@ -1096,7 +1096,17 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
                struct scsi_data_buffer *prot_sdb = cmd->prot_sdb;
                int ivecs, count;
 
-               BUG_ON(prot_sdb == NULL);
+               if (prot_sdb == NULL) {
+                       /*
+                        * This can happen if someone (e.g. multipath)
+                        * queues a command to a device on an adapter
+                        * that does not support DIX.
+                        */
+                       WARN_ON_ONCE(1);
+                       error = BLKPREP_KILL;
+                       goto err_exit;
+               }
+
                ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
 
                if (scsi_alloc_sgtable(prot_sdb, ivecs, gfp_mask)) {