warren/gotgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error handling for unsupported commands

Browse Source 
- Respond with failure for unsupported task management commands
- Increase MaxRecvDataSegmentLength to 65536, to match FirstBurstLength

Signed-off-by: Utkarsh Mani Tripathi <utkarsh.tripathi@mayadata.io>
This commit is contained in:
Utkarsh Mani Tripathi
2019-11-18 18:20:59 +05:30
parent 64deda8106
commit 1b02c7897e
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/port/iscsit/iscsid.go
-2
View File
@@ -841,10 +841,8 @@ func (s *ISCSITargetDriver) iscsiExecTask(task *iscsiTask) error {
fallthrough fallthrough
case ISCSI_TM_FUNC_TARGET_WARM_RESET, ISCSI_TM_FUNC_TARGET_COLD_RESET, ISCSI_TM_FUNC_TASK_REASSIGN: case ISCSI_TM_FUNC_TARGET_WARM_RESET, ISCSI_TM_FUNC_TARGET_COLD_RESET, ISCSI_TM_FUNC_TASK_REASSIGN:
task.result = ISCSI_TMF_RSP_NOT_SUPPORTED task.result = ISCSI_TMF_RSP_NOT_SUPPORTED
return fmt.Errorf("The task function is not supported")
default: default:
task.result = ISCSI_TMF_RSP_REJECTED task.result = ISCSI_TMF_RSP_REJECTED
return fmt.Errorf("Unknown task function")
} }
// return response to initiator // return response to initiator
return task.conn.buildRespPackage(OpSCSITaskResp, task) return task.conn.buildRespPackage(OpSCSITaskResp, task)
pkg/port/iscsit/session.go
+1 -1
View File
@@ -184,7 +184,7 @@ func boolKeyInConv(value uint) string {
var sessionKeys map[string]*iscsiSessionKeys = map[string]*iscsiSessionKeys{ var sessionKeys map[string]*iscsiSessionKeys = map[string]*iscsiSessionKeys{
// ISCSI_PARAM_MAX_RECV_DLENGTH // ISCSI_PARAM_MAX_RECV_DLENGTH
"MaxRecvDataSegmentLength": {ISCSI_PARAM_MAX_RECV_DLENGTH, true, 32768, 512, 16777215, numberKeyConv, numberKeyInConv}, "MaxRecvDataSegmentLength": {ISCSI_PARAM_MAX_RECV_DLENGTH, true, 65536, 512, 16777215, numberKeyConv, numberKeyInConv},
// ISCSI_PARAM_HDRDGST_EN // ISCSI_PARAM_HDRDGST_EN
"HeaderDigest": {ISCSI_PARAM_HDRDGST_EN, false, DIGEST_NONE, DIGEST_NONE, DIGEST_ALL, digestKeyConv, digestKeyInConv}, "HeaderDigest": {ISCSI_PARAM_HDRDGST_EN, false, DIGEST_NONE, DIGEST_NONE, DIGEST_ALL, digestKeyConv, digestKeyInConv},
// ISCSI_PARAM_DATADGST_EN // ISCSI_PARAM_DATADGST_EN
pkg/scsi/spc.go
+1 -1
View File
@@ -29,7 +29,7 @@ import (
) )
func SPCIllegalOp(host int, cmd *api.SCSICommand) api.SAMStat { func SPCIllegalOp(host int, cmd *api.SCSICommand) api.SAMStat {
BuildSenseData(cmd, ILLEGAL_REQUEST, ASC_INVALID_FIELD_IN_CDB) BuildSenseData(cmd, ILLEGAL_REQUEST, ASC_INVALID_OP_CODE)
return api.SAMStatCheckCondition return api.SAMStatCheckCondition
} }