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

Commit 3908c983 authored by Damien Le Moal's avatar Damien Le Moal Committed by Mike Snitzer
Browse files

dm zoned: fix overflow when converting zone ID to sectors 



A zone ID is a 32 bits unsigned int which can overflow when doing the
bit shifts in dmz_start_sect().  With a 256 MB zone size drive, the
overflow happens for a zone ID >= 8192.

Fix this by casting the zone ID to a sector_t before doing the bit
shift.  While at it, similarly fix dmz_start_block().

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 4d49f1b4

drivers/md/dm-zoned-metadata.c

+2 −2
Original line number Diff line number Diff line
@@ -191,12 +191,12 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) 


sector_t dmz_start_sect(struct dmz_metadata *zmd, struct dm_zone *zone)

{

	return dmz_id(zmd, zone) << zmd->dev->zone_nr_sectors_shift;

	return (sector_t)dmz_id(zmd, zone) << zmd->dev->zone_nr_sectors_shift;

}



sector_t dmz_start_block(struct dmz_metadata *zmd, struct dm_zone *zone)

{

	return dmz_id(zmd, zone) << zmd->dev->zone_nr_blocks_shift;

	return (sector_t)dmz_id(zmd, zone) << zmd->dev->zone_nr_blocks_shift;

}



unsigned int dmz_nr_chunks(struct dmz_metadata *zmd)