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

Commit 49414387 authored by Damien Le Moal's avatar Damien Le Moal Committed by Greg Kroah-Hartman
Browse files

scsi: sd_zbc: Fix sd_zbc_read_zoned_characteristics() 



commit 4a109032e3941413d8a029f619543fc5aec1d26d upstream.

The three values starting at byte 8 of the Zoned Block Device
Characteristics VPD page B6h are 32 bits values, not 64bits. So use
get_unaligned_be32() to retrieve the values and not get_unaligned_be64()

Fixes: 89d94756 ("sd: Implement support for ZBC devices")
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 645fbe74

drivers/scsi/sd_zbc.c

+3 −3
Original line number Diff line number Diff line
@@ -375,15 +375,15 @@ static int sd_zbc_read_zoned_characteristics(struct scsi_disk *sdkp, 
	if (sdkp->device->type != TYPE_ZBC) {

		/* Host-aware */

		sdkp->urswrz = 1;

		sdkp->zones_optimal_open = get_unaligned_be64(&buf[8]);

		sdkp->zones_optimal_nonseq = get_unaligned_be64(&buf[12]);

		sdkp->zones_optimal_open = get_unaligned_be32(&buf[8]);

		sdkp->zones_optimal_nonseq = get_unaligned_be32(&buf[12]);

		sdkp->zones_max_open = 0;

	} else {

		/* Host-managed */

		sdkp->urswrz = buf[4] & 1;

		sdkp->zones_optimal_open = 0;

		sdkp->zones_optimal_nonseq = 0;

		sdkp->zones_max_open = get_unaligned_be64(&buf[16]);

		sdkp->zones_max_open = get_unaligned_be32(&buf[16]);

	}



	return 0;