summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2012-09-14 16:35:10 -0500
committerJens Axboe <axboe@kernel.dk>2012-09-18 11:57:08 +0200
commit2453f5f992717251cfadab6184fbb3ec2f2e8b40 (patch)
treef4d48604b3588408cd393d075870cdbd50985b7d /drivers
parent2bd6efad25d7c1950008e2ab4e2d6796001919fc (diff)
downloadlinux-3.10-2453f5f992717251cfadab6184fbb3ec2f2e8b40.tar.gz
linux-3.10-2453f5f992717251cfadab6184fbb3ec2f2e8b40.tar.bz2
linux-3.10-2453f5f992717251cfadab6184fbb3ec2f2e8b40.zip
cciss: fix handling of protocol error
If a command completes with a status of CMD_PROTOCOL_ERR, this information should be conveyed to the SCSI mid layer, not dropped on the floor. Unlike a similar bug in the hpsa driver, this bug only affects tape drives and CD and DVD ROM drives in the cciss driver, and to induce it, you have to disconnect (or damage) a cable, so it is not a very likely scenario (which would explain why the bug has gone undetected for the last 10 years.) Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/cciss_scsi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 38aa6dda6b8..da3311129a0 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -795,6 +795,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout,
}
break;
case CMD_PROTOCOL_ERR:
+ cmd->result = DID_ERROR << 16;
dev_warn(&h->pdev->dev,
"%p has protocol error\n", c);
break;