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

Commit 5d5ff44f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] fix up request buffer reference in various scsi drivers 



Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their
queuecommand functions.  Those fields are internal storage for the
midlayer only and are used to restore the original payload after
request_buffer and request_bufflen have been overwritten for EH.  Using
the buffer and bufflen fields means they do very broken things in error
handling.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent e4a082c7

drivers/block/cciss_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag) 


	if (cmd->use_sg) {

		pci_unmap_sg(ctlr->pdev,

			cmd->buffer, cmd->use_sg,

			cmd->request_buffer, cmd->use_sg,

				cmd->sc_data_direction); 

	}

	else if (cmd->request_bufflen) {
@@ -1210,7 +1210,7 @@ cciss_scatter_gather(struct pci_dev *pdev, 
		struct scsi_cmnd *cmd)

{

	unsigned int use_sg, nsegs=0, len;

	struct scatterlist *scatter = (struct scatterlist *) cmd->buffer;

	struct scatterlist *scatter = (struct scatterlist *) cmd->request_buffer;

	__u64 addr64;



	/* is it just one virtual address? */
@@ -1232,7 +1232,7 @@ cciss_scatter_gather(struct pci_dev *pdev, 
	} /* else, must be a list of virtual addresses.... */

	else if (cmd->use_sg <= MAXSGENTRIES) {	/* not too many addrs? */



		use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, 

		use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg,

			cmd->sc_data_direction);



		for (nsegs=0; nsegs < use_sg; nsegs++) {

drivers/scsi/3w-9xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static int twa_map_scsi_sg_data(TW_Device_Extension *tw_dev, int request_id) 
	if (cmd->use_sg == 0)

		goto out;



	use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, DMA_BIDIRECTIONAL);

	use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg, DMA_BIDIRECTIONAL);



	if (use_sg == 0) {

		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to map scatter gather list");

drivers/scsi/3w-xxxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ static int tw_map_scsi_sg_data(struct pci_dev *pdev, struct scsi_cmnd *cmd) 
	if (cmd->use_sg == 0)

		return 0;



	use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, DMA_BIDIRECTIONAL);

	use_sg = pci_map_sg(pdev, cmd->request_buffer, cmd->use_sg, DMA_BIDIRECTIONAL);

	

	if (use_sg == 0) {

		printk(KERN_WARNING "3w-xxxx: tw_map_scsi_sg_data(): pci_map_sg() failed.\n");

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd) 
	 */



	if (cmd->use_sg) {

		cmd->SCp.buffer = (struct scatterlist *) cmd->buffer;

		cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;

		cmd->SCp.buffers_residual = cmd->use_sg - 1;

		cmd->SCp.ptr = page_address(cmd->SCp.buffer->page)+

			       cmd->SCp.buffer->offset;

drivers/scsi/aacraid/aachba.c

+2 −2
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static void io_callback(void *context, struct fib * fibptr) 
		

	if(scsicmd->use_sg)

		pci_unmap_sg(dev->pdev, 

			(struct scatterlist *)scsicmd->buffer,

			(struct scatterlist *)scsicmd->request_buffer,

			scsicmd->use_sg,

			scsicmd->sc_data_direction);

	else if(scsicmd->request_bufflen)
@@ -1919,7 +1919,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) 


	if(scsicmd->use_sg)

		pci_unmap_sg(dev->pdev, 

			(struct scatterlist *)scsicmd->buffer,

			(struct scatterlist *)scsicmd->request_buffer,

			scsicmd->use_sg,

			scsicmd->sc_data_direction);

	else if(scsicmd->request_bufflen)