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

Commit d0ad3bc9 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] libata: fix corruption induced by relaxed DMA alignment in SCSI 



Hugh Dickens noticed that SMART commands issued from user space can
end up corupting memory.  The problem occurs if the buffer used to
read data spans two pages.  The reason is that the PIO sector routines
in libata are expecting physically contiguous pages when they do
sector operations, so the left overs on the second page go into the
next physically adjacent page rather than the next page in the sg
mapping.

Fix this by enforcing strict 512 byte alignment on all buffers from
userspace.

Acked-by: default avatarHugh Dickins <hugh@veritas.com>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 465ff318

drivers/ata/libata-scsi.c

+8 −4
Original line number Diff line number Diff line
@@ -824,9 +824,6 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev) 
	 * requests.

	 */

	sdev->max_device_blocked = 1;



	/* set the min alignment */

	blk_queue_update_dma_alignment(sdev->request_queue, ATA_DMA_PAD_SZ - 1);

}



static void ata_scsi_dev_config(struct scsi_device *sdev,
@@ -842,7 +839,14 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, 
	if (dev->class == ATA_DEV_ATAPI) {

		struct request_queue *q = sdev->request_queue;

		blk_queue_max_hw_segments(q, q->max_hw_segments - 1);

	}



		/* set the min alignment */

		blk_queue_update_dma_alignment(sdev->request_queue,

					       ATA_DMA_PAD_SZ - 1);

	} else

		/* ATA devices must be sector aligned */

		blk_queue_update_dma_alignment(sdev->request_queue,

					       ATA_SECT_SIZE - 1);



	if (dev->flags & ATA_DFLAG_AN)

		set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);