mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
scsi: target: Fix truncated PR-in ReadKeys response
SPC5r17 states that the contents of the ADDITIONAL LENGTH field are not altered based on the allocation length, so always calculate and pack the full key list length even if the list itself is truncated. According to Maged: Yes it fixes the "Storage Spaces Persistent Reservation" test in the Windows 2016 Server Failover Cluster validation suites when having many connections that result in more than 8 registrations. I tested your patch on 4.17 with iblock. This behaviour can be tested using the libiscsi PrinReadKeys.Truncate test. Cc: [email protected] Signed-off-by: David Disseldorp <[email protected]> Reviewed-by: Mike Christie <[email protected]> Tested-by: Maged Mokhtar <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
This commit is contained in:
parent
52ab9768f7
commit
63ce3c384d
1 changed files with 10 additions and 5 deletions
|
|
@ -3727,11 +3727,16 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd)
|
|||
* Check for overflow of 8byte PRI READ_KEYS payload and
|
||||
* next reservation key list descriptor.
|
||||
*/
|
||||
if ((add_len + 8) > (cmd->data_length - 8))
|
||||
break;
|
||||
|
||||
put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
|
||||
off += 8;
|
||||
if (off + 8 <= cmd->data_length) {
|
||||
put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
|
||||
off += 8;
|
||||
}
|
||||
/*
|
||||
* SPC5r17: 6.16.2 READ KEYS service action
|
||||
* The ADDITIONAL LENGTH field indicates the number of bytes in
|
||||
* the Reservation key list. The contents of the ADDITIONAL
|
||||
* LENGTH field are not altered based on the allocation length
|
||||
*/
|
||||
add_len += 8;
|
||||
}
|
||||
spin_unlock(&dev->t10_pr.registration_lock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue