diff options
| author | Ewan D. Milne <emilne@redhat.com> | 2015-01-15 10:02:12 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-01-20 09:04:21 +0100 |
| commit | 91724c20613484555ba7e7b3d8549dac1e24f7a8 (patch) | |
| tree | 43c97b70855b1932396e98208671d7804a696e67 /drivers/scsi/scsi_lib.c | |
| parent | 99531e6063283da4468741185fe48b8eb037d919 (diff) | |
| download | blackbird-op-linux-91724c20613484555ba7e7b3d8549dac1e24f7a8.tar.gz blackbird-op-linux-91724c20613484555ba7e7b3d8549dac1e24f7a8.zip | |
scsi: Avoid crashing if device uses DIX but adapter does not support it
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>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6d5c0b8cb0bb..17bb541f7cc2 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1143,7 +1143,17 @@ int scsi_init_io(struct scsi_cmnd *cmd) 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, is_mq)) { |
