Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / drivers / scsi / vmw_pvscsi.c

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 0f133c1817de3421bb74133a8a48e79d9e0c3c3d..6164634aff1895b208e919ffd47b6aaf59ca5e91 100644 (file)
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -349,9 +349,9 @@ static void pvscsi_create_sg(struct pvscsi_ctx *ctx,
  * Map all data buffers for a command into PCI space and
  * setup the scatter/gather list if needed.
  */
-static void pvscsi_map_buffers(struct pvscsi_adapter *adapter,
-                              struct pvscsi_ctx *ctx, struct scsi_cmnd *cmd,
-                              struct PVSCSIRingReqDesc *e)
+static int pvscsi_map_buffers(struct pvscsi_adapter *adapter,
+                             struct pvscsi_ctx *ctx, struct scsi_cmnd *cmd,
+                             struct PVSCSIRingReqDesc *e)
 {
        unsigned count;
        unsigned bufflen = scsi_bufflen(cmd);
@@ -360,18 +360,30 @@ static void pvscsi_map_buffers(struct pvscsi_adapter *adapter,
        e->dataLen = bufflen;
        e->dataAddr = 0;
        if (bufflen == 0)
-               return;
+               return 0;
 
        sg = scsi_sglist(cmd);
        count = scsi_sg_count(cmd);
        if (count != 0) {
                int segs = scsi_dma_map(cmd);
-               if (segs > 1) {
+
+               if (segs == -ENOMEM) {
+                       scmd_printk(KERN_ERR, cmd,
+                                   "vmw_pvscsi: Failed to map cmd sglist for DMA.\n");
+                       return -ENOMEM;
+               } else if (segs > 1) {
                        pvscsi_create_sg(ctx, sg, segs);
 
                        e->flags |= PVSCSI_FLAG_CMD_WITH_SG_LIST;
                        ctx->sglPA = pci_map_single(adapter->dev, ctx->sgl,
                                                    SGL_SIZE, PCI_DMA_TODEVICE);
+                       if (pci_dma_mapping_error(adapter->dev, ctx->sglPA)) {
+                               scmd_printk(KERN_ERR, cmd,
+                                           "vmw_pvscsi: Failed to map ctx sglist for DMA.\n");
+                               scsi_dma_unmap(cmd);
+                               ctx->sglPA = 0;
+                               return -ENOMEM;
+                       }
                        e->dataAddr = ctx->sglPA;
                } else
                        e->dataAddr = sg_dma_address(sg);
@@ -382,8 +394,15 @@ static void pvscsi_map_buffers(struct pvscsi_adapter *adapter,
                 */
                ctx->dataPA = pci_map_single(adapter->dev, sg, bufflen,
                                             cmd->sc_data_direction);
+               if (pci_dma_mapping_error(adapter->dev, ctx->dataPA)) {
+                       scmd_printk(KERN_ERR, cmd,
+                                   "vmw_pvscsi: Failed to map direct data buffer for DMA.\n");
+                       return -ENOMEM;
+               }
                e->dataAddr = ctx->dataPA;
        }
+
+       return 0;
 }
 
 static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,
@@ -690,6 +709,12 @@ static int pvscsi_queue_ring(struct pvscsi_adapter *adapter,
                ctx->sensePA = pci_map_single(adapter->dev, cmd->sense_buffer,
                                              SCSI_SENSE_BUFFERSIZE,
                                              PCI_DMA_FROMDEVICE);
+               if (pci_dma_mapping_error(adapter->dev, ctx->sensePA)) {
+                       scmd_printk(KERN_ERR, cmd,
+                                   "vmw_pvscsi: Failed to map sense buffer for DMA.\n");
+                       ctx->sensePA = 0;
+                       return -ENOMEM;
+               }
                e->senseAddr = ctx->sensePA;
                e->senseLen = SCSI_SENSE_BUFFERSIZE;
        } else {
@@ -711,7 +736,15 @@ static int pvscsi_queue_ring(struct pvscsi_adapter *adapter,
        else
                e->flags = 0;
 
-       pvscsi_map_buffers(adapter, ctx, cmd, e);
+       if (pvscsi_map_buffers(adapter, ctx, cmd, e) != 0) {
+               if (cmd->sense_buffer) {
+                       pci_unmap_single(adapter->dev, ctx->sensePA,
+                                        SCSI_SENSE_BUFFERSIZE,
+                                        PCI_DMA_FROMDEVICE);
+                       ctx->sensePA = 0;
+               }
+               return -ENOMEM;
+       }
 
        e->context = pvscsi_map_context(adapter, ctx);