Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2bea6df authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley
Browse files

[SCSI] hpsa: check for dma_mapping_error in hpsa_map_sg_chain_block 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent a2dac136

drivers/scsi/hpsa.c

+12 −2
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ static int hpsa_allocate_sg_chain_blocks(struct ctlr_info *h) 
	return -ENOMEM;

}



static void hpsa_map_sg_chain_block(struct ctlr_info *h,

static int hpsa_map_sg_chain_block(struct ctlr_info *h,

	struct CommandList *c)

{

	struct SGDescriptor *chain_sg, *chain_block;
@@ -1144,8 +1144,15 @@ static void hpsa_map_sg_chain_block(struct ctlr_info *h, 
		(c->Header.SGTotal - h->max_cmd_sg_entries);

	temp64 = pci_map_single(h->pdev, chain_block, chain_sg->Len,

				PCI_DMA_TODEVICE);

	if (dma_mapping_error(&h->pdev->dev, temp64)) {

		/* prevent subsequent unmapping */

		chain_sg->Addr.lower = 0;

		chain_sg->Addr.upper = 0;

		return -1;

	}

	chain_sg->Addr.lower = (u32) (temp64 & 0x0FFFFFFFFULL);

	chain_sg->Addr.upper = (u32) ((temp64 >> 32) & 0x0FFFFFFFFULL);

	return 0;

}



static void hpsa_unmap_sg_chain_block(struct ctlr_info *h,
@@ -2123,7 +2130,10 @@ static int hpsa_scatter_gather(struct ctlr_info *h, 
	if (chained) {

		cp->Header.SGList = h->max_cmd_sg_entries;

		cp->Header.SGTotal = (u16) (use_sg + 1);

		hpsa_map_sg_chain_block(h, cp);

		if (hpsa_map_sg_chain_block(h, cp)) {

			scsi_dma_unmap(cmd);

			return -1;

		}

		return 0;

	}