Commit f92de9d1 authored by Tyler Erickson's avatar Tyler Erickson Committed by Martin K. Petersen
Browse files

scsi: sd: Fix interpretation of VPD B9h length 

Fixing the interpretation of the length of the B9h VPD page (Concurrent
Positioning Ranges). Adding 4 is necessary as the first 4 bytes of the page
is the header with page number and length information.  Adding 3 was likely
a misinterpretation of the SBC-5 specification which sets all offsets
starting at zero.

This fixes the error in dmesg:

[ 9.014456] sd 1:0:0:0: [sda] Invalid Concurrent Positioning Ranges VPD page

Link: https://lore.kernel.org/r/20220602225113.10218-4-tyler.erickson@seagate.com


Fixes: e815d365 ("scsi: sd: add concurrent positioning ranges support")
Cc: stable@vger.kernel.org
Tested-by: default avatarMichael English <michael.english@seagate.com>
Reviewed-by: default avatarMuhammad Ahmad <muhammad.ahmad@seagate.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarTyler Erickson <tyler.erickson@seagate.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f2906aa8

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -3072,7 +3072,7 @@ static void sd_read_cpr(struct scsi_disk *sdkp) 
		goto out;



	/* We must have at least a 64B header and one 32B range descriptor */

	vpd_len = get_unaligned_be16(&buffer[2]) + 3;

	vpd_len = get_unaligned_be16(&buffer[2]) + 4;

	if (vpd_len > buf_len || vpd_len < 64 + 32 || (vpd_len & 31)) {

		sd_printk(KERN_ERR, sdkp,

			  "Invalid Concurrent Positioning Ranges VPD page\n");