Commit 9eaa88c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull libata fix from Damien Le Moal:
 "A single fix for this cycle:

   - Check that ATA16 passthrough commands that do not transfer any data
     have a DMA direction set to DMA_NONE (From George)"

* tag 'libata-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  libata: if T_LENGTH is zero, dma direction should be DMA_NONE
parents 1887bf5c 5da5231b

drivers/ata/libata-scsi.c

+13 −2
Original line number Diff line number Diff line
@@ -2859,8 +2859,19 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) 
		goto invalid_fld;

	}



	if (ata_is_ncq(tf->protocol) && (cdb[2 + cdb_offset] & 0x3) == 0)

	if ((cdb[2 + cdb_offset] & 0x3) == 0) {

		/*

		 * When T_LENGTH is zero (No data is transferred), dir should

		 * be DMA_NONE.

		 */

		if (scmd->sc_data_direction != DMA_NONE) {

			fp = 2 + cdb_offset;

			goto invalid_fld;

		}



		if (ata_is_ncq(tf->protocol))

			tf->protocol = ATA_PROT_NCQ_NODATA;

	}



	/* enable LBA */

	tf->flags |= ATA_TFLAG_LBA;