diff mbox series

dm: check the sector size of underlying device when verifying start

Message ID alpine.LRH.2.02.1808101122300.16981@file01.intranet.prod.int.rdu2.redhat.com (mailing list archive)
State Rejected, archived
Delegated to: Mike Snitzer
Headers show
Series dm: check the sector size of underlying device when verifying start | expand

Commit Message

Mikulas Patocka Aug. 10, 2018, 3:23 p.m. UTC
It was found out that these commands would fail:
# modprobe scsi_debug dev_size_mb=128 sector_size=512
# dmsetup create crypt0 --table "0 245752 crypt cipher_null-ecb - 0 /dev/sda 16385 1 sector_size:4096"
with the error
"device-mapper: table: 253:0: start=16385 not aligned to h/w logical block size 4096 of sda"

The logic incorrectly checks the starting sector offset on the underlying
device against the block size of the device that is being created.

This patch fixes it by checking the starting sector offset against the
block size of the underlying device, not the device that is being created.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org

---
 drivers/md/dm-table.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

Comments

Mike Snitzer Aug. 10, 2018, 3:56 p.m. UTC | #1
On Fri, Aug 10 2018 at 11:23am -0400,
Mikulas Patocka <mpatocka@redhat.com> wrote:

> It was found out that these commands would fail:
> # modprobe scsi_debug dev_size_mb=128 sector_size=512
> # dmsetup create crypt0 --table "0 245752 crypt cipher_null-ecb - 0 /dev/sda 16385 1 sector_size:4096"
> with the error
> "device-mapper: table: 253:0: start=16385 not aligned to h/w logical block size 4096 of sda"
> 
> The logic incorrectly checks the starting sector offset on the underlying
> device against the block size of the device that is being created.
> 
> This patch fixes it by checking the starting sector offset against the
> block size of the underlying device, not the device that is being created.
> 
> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
> Cc: stable@vger.kernel.org

tweaked like we discussed and staged for 4.19 here:
https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-4.19&id=b2f9960fd34e6dddba7975133b84263a2f594a20

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
diff mbox series

Patch

Index: linux-2.6/drivers/md/dm-table.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-table.c	2018-08-10 15:18:31.410000000 +0200
+++ linux-2.6/drivers/md/dm-table.c	2018-08-10 15:18:31.410000000 +0200
@@ -356,7 +356,7 @@  static int device_area_is_invalid(struct
 	if (logical_block_size_sectors <= 1)
 		return 0;
 
-	if (start & (logical_block_size_sectors - 1)) {
+	if (start & (bdev_logical_block_size(dev->bdev) / 512 - 1)) {
 		DMWARN("%s: start=%llu not aligned to h/w "
 		       "logical block size %u of %s",
 		       dm_device_name(ti->table->md),