diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2013-02-20 11:24:57 -0600 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-24 09:36:58 +0000 |
| commit | bcc48ffa4beb0db52bdca42dc3e5ce765c2ed8b5 (patch) | |
| tree | 09c9081e374d78a71f4a125b40542fb4ac3d4bf4 | |
| parent | c1f63c8fe85a63ccf308909237216f55711e5434 (diff) | |
| download | linux-3.10-bcc48ffa4beb0db52bdca42dc3e5ce765c2ed8b5.tar.gz linux-3.10-bcc48ffa4beb0db52bdca42dc3e5ce765c2ed8b5.tar.bz2 linux-3.10-bcc48ffa4beb0db52bdca42dc3e5ce765c2ed8b5.zip | |
[SCSI] hpsa: check for dma_mapping_error in hpsa_passthru ioctls
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/hpsa.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index a7c3d471153..7f4f790a3d7 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3014,6 +3014,13 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) if (iocommand.buf_size > 0) { temp64.val = pci_map_single(h->pdev, buff, iocommand.buf_size, PCI_DMA_BIDIRECTIONAL); + if (dma_mapping_error(&h->pdev->dev, temp64.val)) { + c->SG[0].Addr.lower = 0; + c->SG[0].Addr.upper = 0; + c->SG[0].Len = 0; + rc = -ENOMEM; + goto out; + } c->SG[0].Addr.lower = temp64.val32.lower; c->SG[0].Addr.upper = temp64.val32.upper; c->SG[0].Len = iocommand.buf_size; @@ -3135,6 +3142,15 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) for (i = 0; i < sg_used; i++) { temp64.val = pci_map_single(h->pdev, buff[i], buff_size[i], PCI_DMA_BIDIRECTIONAL); + if (dma_mapping_error(&h->pdev->dev, temp64.val)) { + c->SG[i].Addr.lower = 0; + c->SG[i].Addr.upper = 0; + c->SG[i].Len = 0; + hpsa_pci_unmap(h->pdev, c, i, + PCI_DMA_BIDIRECTIONAL); + status = -ENOMEM; + goto cleanup1; + } c->SG[i].Addr.lower = temp64.val32.lower; c->SG[i].Addr.upper = temp64.val32.upper; c->SG[i].Len = buff_size[i]; |