| Message ID | 1485556252-10888-1-git-send-email-khoroshilov@ispras.ru (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Sat, 2017-01-28 at 01:30 +0300, Alexey Khoroshilov wrote: > wd719x_queuecommand() doesn't check if mapping dma memory succeed. > The patch adds the check and failure handling. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> > --- > drivers/scsi/wd719x.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c > index 2a9da2e0ea6b..41ddbdcf02e0 100644 > --- a/drivers/scsi/wd719x.c > +++ b/drivers/scsi/wd719x.c > @@ -244,6 +244,12 @@ static int wd719x_queuecommand(struct Scsi_Host > *sh, struct scsi_cmnd *cmd) > scb->sense_buf_length = SCSI_SENSE_BUFFERSIZE; > cmd->SCp.dma_handle = dma_map_single(&wd->pdev->dev, cmd > ->sense_buffer, > SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE); > + if (dma_mapping_error(&wd->pdev->dev, cmd->SCp.dma_handle)) > { > + dev_err(&wd->pdev->dev, "unable to map dma\n"); > + wd719x_finish_cmd(cmd, DID_ERROR); > + spin_unlock_irqrestore(wd->sh->host_lock, flags); > + return 0; > + } I'm not at all convinced of the wisdom of doing this for an ancient driver: this thing is presumably x86 and ancient in which case it will never fail anyway. However, for the future, a mapping error is transient, meaning we want the command retried, not errored, so from queuecommand you return SCSI_MLQUEUE_HOST_BUSY to induce a pause and retry. James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c index 2a9da2e0ea6b..41ddbdcf02e0 100644 --- a/drivers/scsi/wd719x.c +++ b/drivers/scsi/wd719x.c @@ -244,6 +244,12 @@ static int wd719x_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd) scb->sense_buf_length = SCSI_SENSE_BUFFERSIZE; cmd->SCp.dma_handle = dma_map_single(&wd->pdev->dev, cmd->sense_buffer, SCSI_SENSE_BUFFERSIZE, DMA_FROM_DEVICE); + if (dma_mapping_error(&wd->pdev->dev, cmd->SCp.dma_handle)) { + dev_err(&wd->pdev->dev, "unable to map dma\n"); + wd719x_finish_cmd(cmd, DID_ERROR); + spin_unlock_irqrestore(wd->sh->host_lock, flags); + return 0; + } scb->sense_buf = cpu_to_le32(cmd->SCp.dma_handle); /* request autosense */
wd719x_queuecommand() doesn't check if mapping dma memory succeed. The patch adds the check and failure handling. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> --- drivers/scsi/wd719x.c | 6 ++++++ 1 file changed, 6 insertions(+)