admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lib/scsi: fix PRin REPORT CAPS allow_cmds unmarshalling

Browse Source 
The Persistent Reserve In REPORT CAPABILITIES response carries the
ALLOW COMMANDS field in bits 4-6 at byte offset 3.
Bit 7 (TMV) should be masked out during ALLOW COMMANDS unmarshalling.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2015-09-24 16:10:57 +02:00
parent 46e606f048
commit ef8e59a24d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scsi-lowlevel.c
View File

@@ -947,7 +947,7 @@ scsi_persistentreservein_datain_unmarshall(struct scsi_task *task)
rc->atp_c = !!(task_get_uint8(task, 2) & 0x04); rc->atp_c = !!(task_get_uint8(task, 2) & 0x04);
rc->ptpl_c = !!(task_get_uint8(task, 2) & 0x01); rc->ptpl_c = !!(task_get_uint8(task, 2) & 0x01);
rc->tmv = !!(task_get_uint8(task, 3) & 0x80); rc->tmv = !!(task_get_uint8(task, 3) & 0x80);
rc->allow_commands = task_get_uint8(task, 3) >> 4; rc->allow_commands = (task_get_uint8(task, 3) & 0x70) >> 4;
rc->persistent_reservation_type_mask = task_get_uint16(task, 4); rc->persistent_reservation_type_mask = task_get_uint16(task, 4);
return rc; return rc;
@@ -3396,7 +3396,7 @@ scsi_datain_getfullsize(struct scsi_task *task)
case SCSI_OPCODE_INQUIRY: case SCSI_OPCODE_INQUIRY:
return scsi_inquiry_datain_getfullsize(task); return scsi_inquiry_datain_getfullsize(task);
case SCSI_OPCODE_MODESENSE6: case SCSI_OPCODE_MODESENSE6:
return scsi_modesense_datain_getfullsize(task, 1); return scsi_modesense_datain_getfullsize(task, 1);
case SCSI_OPCODE_READCAPACITY10: case SCSI_OPCODE_READCAPACITY10:
return scsi_readcapacity10_datain_getfullsize(task); return scsi_readcapacity10_datain_getfullsize(task);
case SCSI_OPCODE_SYNCHRONIZECACHE10: case SCSI_OPCODE_SYNCHRONIZECACHE10:
@@ -3425,7 +3425,7 @@ scsi_datain_unmarshall(struct scsi_task *task)
case SCSI_OPCODE_MODESENSE6: case SCSI_OPCODE_MODESENSE6:
return scsi_modesense_datain_unmarshall(task, 1); return scsi_modesense_datain_unmarshall(task, 1);
case SCSI_OPCODE_MODESENSE10: case SCSI_OPCODE_MODESENSE10:
return scsi_modesense_datain_unmarshall(task, 0); return scsi_modesense_datain_unmarshall(task, 0);
case SCSI_OPCODE_READCAPACITY10: case SCSI_OPCODE_READCAPACITY10:
return scsi_readcapacity10_datain_unmarshall(task); return scsi_readcapacity10_datain_unmarshall(task);
case SCSI_OPCODE_READTOC: case SCSI_OPCODE_READTOC: