ata: pata_ep93xx: fix incorrect return value in data_xfer
PATCH 1/1 ata: pata_ep93xx: fix incorrect return value in data_xfer
The while (words--) loop post-decrements words, so it underflows from 0 to UINT_MAX on exit. The function then returns "words << 1", which is either 0 (for odd-length transfers after words++) or 0xFFFFFFFE (for even-length transfers). Callers like __atapi_pio_bytes() depend on the correct byte count to manage scatter-gather progress; a wrong value causes ATAPI PIO transfer errors.
Fix by returning ALIGN(buflen, 2) instead of the corrupted words counter, matching what ata_sff_data_xfer() effectively returns via its words counter.
--- drivers/ata/pata_ep93xx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/ata/pata_ep93xx.c +3 -5
@@ -502,15 +502,13 @@ static unsigned int ep93xx_pata_data_xfer(struct ata_queued_cmd *qc,if (unlikely (buflen &0x01 )) { buf += buflen -1 ; -if (rw ==READ ) { +if (rw ==READ ) *buf =ep93xx_pata_read_data (drv_data,IDECTRL_ADDR_DATA ); - }else { +else ep93xx_pata_write_data (drv_data, *buf,IDECTRL_ADDR_DATA ); - } - words++; } -return words <<1 ; +return ALIGN (buflen,2 ); }/* Note: original code is ata_devchk */
Signature · 1 line
2.55.0
Damien Le Moal
maintainerQuoted 7 lines · Rosen Penev
The while (words--) loop post-decrements words, so it underflows from 0 to
UINT_MAXon exit. The function then returns "words << 1", which is either 0 (for odd-length transfers after words++) or0xFFFFFFFE(for even-length transfers). Callers like__atapi_pio_bytes()depend on the correct byte count to manage scatter-gather progress; a wrong value causes ATAPI PIO transfer errors.
Quoted 6 lines
Fix by returning
ALIGN(buflen, 2)instead of the corrupted words counter, matching whatata_sff_data_xfer()effectively returns via its words counter.Assisted-by opencode:big-pickleSigned-off-by Rosen Penev <[email protected]>
This does not apply cleanly. Please rebase on libata/for-7.3.
Signature · 2 lines
Damien Le Moal Western Digital Research