]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
s390/dasd: enforce dma_alignment to ensure proper buffer validation
authorJaehoon Kim <jhkim@linux.ibm.com>
Thu, 25 Sep 2025 15:47:08 +0000 (17:47 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 25 Sep 2025 16:34:30 +0000 (10:34 -0600)
The block layer validates buffer alignment using the device's
dma_alignment value. If dma_alignment is smaller than
logical_block_size(bp_block) -1, misaligned buffer incorrectly pass
validation and propagate to the lower-level driver.

This patch adjusts dma_alignment to be at least logical_block_size -1,
ensuring that misalignment buffers are properly rejected at the block
layer and do not reach the DASD driver unnecessarily.

Fixes: 2a07bb64d801 ("s390/dasd: Remove DMA alignment")
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Cc: stable@vger.kernel.org #6.11+
Signed-off-by: Jaehoon Kim <jhkim@linux.ibm.com>
Signed-off-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/s390/block/dasd.c

index 1d624388075ff30a1998d0ecd3441bec49a8de95..7765e40f7ceac03c22ca6f3605f5bfe12b5f16c3 100644 (file)
@@ -334,6 +334,11 @@ static int dasd_state_basic_to_ready(struct dasd_device *device)
        lim.max_dev_sectors = device->discipline->max_sectors(block);
        lim.max_hw_sectors = lim.max_dev_sectors;
        lim.logical_block_size = block->bp_block;
+       /*
+        * Adjust dma_alignment to match block_size - 1
+        * to ensure proper buffer alignment checks in the block layer.
+        */
+       lim.dma_alignment = lim.logical_block_size - 1;
 
        if (device->discipline->has_discard) {
                unsigned int max_bytes;