diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-07 17:20:43 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-07 17:20:43 -0400 |
| commit | 11e50ed239b5b7f383874dd737283ae93f62ece3 (patch) | |
| tree | 6f990dd80caf1efee86926541b30cad9e2003cef /drivers/scsi/sd.c | |
| parent | 88f1669019bd62b3009a3cebf772fbaaa21b9f38 (diff) | |
| parent | fce54ed027577517df1e74b7d54dc2b1bd536887 (diff) | |
| download | linux-11e50ed239b5b7f383874dd737283ae93f62ece3.tar.gz | |
Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging
Bring in fixes to resolve a merge conflict in the lpfc driver update.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 84696b3652ee7..081e39b3543b7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3073,7 +3073,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"); |