target: Fix sense data for out-of-bounds IO operations
Subsystems (2)
PATCH 1/3 target: Fix sense data for out-of-bounds IO operations
From: Roland Dreier <[email protected]>
We're supposed to return LOGICAL BLOCK ADDRESS OUT OF RANGE, not INVALID FIELD IN CDB.
--- drivers/target/target_core_sbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_sbc.c +1 -1
@@ -486,7 +486,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)*/ if (cmd->t_task_lba || sectors) {if (sbc_check_valid_sectors (cmd) <0 ) -return TCM_INVALID_CDB_FIELD ; +return TCM_ADDRESS_OUT_OF_RANGE ; } cmd->execute_cmd = ops->execute_sync_cache;break ;
Signature · 1 line
1.8.1.2
PATCH 2/3 target: Fix error checking for UNMAP commands
From: Roland Dreier <[email protected]>
SBC-3 (revision 35) says:
The PARAMETER LIST LENGTH field specifies the length in bytes of the UNMAP parameter list that is available to be transferred from the Data-Out Buffer. If the parameter list length is greater than zero and less than 0008h (i.e., eight), then the device server shall terminate the command with CHECK CONDITION status with the sense key set to ILLEGAL REQUEST and the additional sense code set to PARAMETER LIST LENGTH ERROR. A PARAMETER LIST LENGTH set to zero specifies that no data shall be sent.
so our sense code for too-short descriptors was wrong, and we were incorrectly failing commands that didn't transfer any descriptors.
While we're at it, also handle the UNMAP check:
If the ANCHOR bit is set to one, and the ANC_SUP bit in the Logical Block Provisioning VPD page (see 6.6.4) is set to zero, then the device server shall terminate the command with CHECK CONDITION status with the sense key set to ILLEGAL REQUEST and the additional sense code set to INVALID FIELD IN CDB.
--- drivers/target/target_core_iblock.c | 11 ++++++++++- drivers/target/target_core_transport.c | 10 ++++++++++ include/target/target_core_base.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-)
drivers/target/target_core_iblock.c +10 -1
@@ -390,10 +390,19 @@ iblock_execute_unmap(struct se_cmd *cmd)sense_reason_t ret =0 ;int dl, bd_dl, err; +/* We never set ANC_SUP */ +if (cdb[1 ]) +return TCM_INVALID_CDB_FIELD ; + +if (cmd->data_length ==0 ) { +target_complete_cmd (cmd,SAM_STAT_GOOD ); +return 0 ; + } +if (cmd->data_length <8 ) {pr_warn ("UNMAP parameter list length %u too small\n" , cmd->data_length); -return TCM_INVALID_PARAMETER_LIST ; +return TCM_PARAMETER_LIST_LENGTH_ERROR ; } buf =transport_kmap_data_sg (cmd);
drivers/target/target_core_transport.c +10 -0
@@ -1514,6 +1514,7 @@ void transport_generic_request_failure(struct se_cmd *cmd,case TCM_UNSUPPORTED_SCSI_OPCODE :case TCM_INVALID_CDB_FIELD :case TCM_INVALID_PARAMETER_LIST : +case TCM_PARAMETER_LIST_LENGTH_ERROR :case TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE :case TCM_UNKNOWN_MODE_PAGE :case TCM_WRITE_PROTECTED :
@@ -2674,6 +2675,15 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd,/* INVALID FIELD IN PARAMETER LIST */ buffer[SPC_ASC_KEY_OFFSET ] =0x26 ;break ; +case TCM_PARAMETER_LIST_LENGTH_ERROR : +/* CURRENT ERROR */ + buffer[0 ] =0x70 ; + buffer[SPC_ADD_SENSE_LEN_OFFSET ] =10 ; +/* ILLEGAL REQUEST */ + buffer[SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ; +/* INVALID FIELD IN PARAMETER LIST */ + buffer[SPC_ASC_KEY_OFFSET ] =0x1a ; +break ;case TCM_UNEXPECTED_UNSOLICITED_DATA :/* CURRENT ERROR */ buffer[0 ] =0x70 ;
include/target/target_core_base.h +1 -0
@@ -193,6 +193,7 @@ enum tcm_sense_reason_table {TCM_RESERVATION_CONFLICT =R (0x10 ),TCM_ADDRESS_OUT_OF_RANGE =R (0x11 ),TCM_OUT_OF_RESOURCES =R (0x12 ), +TCM_PARAMETER_LIST_LENGTH_ERROR =R (0x13 ), #undef R };
Signature · 1 line
1.8.1.2
Re: [PATCH 2/3] target: Fix error checking for UNMAP commands
Quoted 10 lines · Roland Dreier
drivers/target/target_core_iblock.c +2
-0@@ -2674,6 +2675,15 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd,/* INVALID FIELD IN PARAMETER LIST */ buffer[SPC_ASC_KEY_OFFSET ] =0x26 ;break ; +case TCM_PARAMETER_LIST_LENGTH_ERROR : +/* CURRENT ERROR */
drivers/target/target_core_iblock.c transport_send_check_condition_and_sense(struct se_cmd *cmd, · line 2689
Quoted 10 lines
drivers/target/target_core_iblock.c +7
-0+ buffer[0 ] =0x70 ; + buffer[SPC_ADD_SENSE_LEN_OFFSET ] =10 ; +/* ILLEGAL REQUEST */ + buffer[SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ; +/* INVALID FIELD IN PARAMETER LIST */ + buffer[SPC_ASC_KEY_OFFSET ] =0x1a ; +break ;case TCM_UNEXPECTED_UNSOLICITED_DATA :/* CURRENT ERROR */ buffer[0 ] =0x70 ;
Nitpick: I suspect a simple copy & paste error; "INVALID FIELD IN PARAMETER LIST" in your comment should probably read "PARAMETER LIST LENGTH ERROR" instead.
HTH,
Chris
Signature · 2 lines
Chris Boot [email protected]
Re: [PATCH 2/3] target: Fix error checking for UNMAP commands
Quoted 14 lines · Chris Boot
drivers/target/target_core_transport.c transport_send_check_condition_and_sense(struct se_cmd *cmd, · line 2689
Quoted 12 lines
drivers/target/target_core_transport.c +9
-0+case TCM_PARAMETER_LIST_LENGTH_ERROR : +/* CURRENT ERROR */ + buffer[0 ] =0x70 ; + buffer[SPC_ADD_SENSE_LEN_OFFSET ] =10 ; +/* ILLEGAL REQUEST */ + buffer[SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ; +/* INVALID FIELD IN PARAMETER LIST */ + buffer[SPC_ASC_KEY_OFFSET ] =0x1a ; +break ;case TCM_UNEXPECTED_UNSOLICITED_DATA :/* CURRENT ERROR */ buffer[0 ] =0x70 ;
Quoted 3 lines
Nitpick: I suspect a simple copy & paste error; "INVALID FIELD IN PARAMETER LIST" in your comment should probably read "PARAMETER LIST LENGTH ERROR" instead.
Yes, the comment is a copy and paste error. The ASC of 1Ah is correct for PARAMETER LIST LENGTH ERROR. Thanks & good catch.
Nic, want me to resend?
- R.
Re: [PATCH 2/3] target: Fix error checking for UNMAP commands
In reply to Roland DreierQuoted 18 lines · Roland Dreier
From: Roland Dreier <[email protected]>
SBC-3 (revision 35) says:
The PARAMETER LIST LENGTH field specifies the length in bytes of the UNMAP parameter list that is available to be transferred from the Data-Out Buffer. If the parameter list length is greater than zero and less than 0008h (i.e., eight), then the device server shall terminate the command with CHECK CONDITION status with the sense key set to ILLEGAL REQUEST and the additional sense code set to PARAMETER LIST LENGTH ERROR. A PARAMETER LIST LENGTH set to zero specifies that no data shall be sent.
so our sense code for too-short descriptors was wrong, and we were incorrectly failing commands that didn't transfer any descriptors.
While we're at it, also handle the UNMAP check:
Quoted 8 lines
If the ANCHOR bit is set to one, and the
ANC_SUPbit in the Logical Block Provisioning VPD page (see 6.6.4) is set to zero, then the device server shall terminate the command with CHECK CONDITION status with the sense key set to ILLEGAL REQUEST and the additional sense code set to INVALID FIELD IN CDB.Signed-off-by Roland Dreier <[email protected]>---
Applied with Chris Boot's cut+paste comment fix.
Thanks,
--nab
Quoted 70 lines
drivers/target/target_core_iblock.c | 11 ++++++++++- drivers/target/target_core_transport.c | 10 ++++++++++ include/target/target_core_base.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-)drivers/target/target_core_iblock.c +10
-1@@ -390,10 +390,19 @@ iblock_execute_unmap(struct se_cmd *cmd)sense_reason_t ret =0 ;int dl, bd_dl, err; +/* We never set ANC_SUP */ +if (cdb[1 ]) +return TCM_INVALID_CDB_FIELD ; + +if (cmd->data_length ==0 ) { +target_complete_cmd (cmd,SAM_STAT_GOOD ); +return 0 ; + } +if (cmd->data_length <8 ) {pr_warn ("UNMAP parameter list length %u too small\n" , cmd->data_length); -return TCM_INVALID_PARAMETER_LIST ; +return TCM_PARAMETER_LIST_LENGTH_ERROR ; } buf =transport_kmap_data_sg (cmd);drivers/target/target_core_transport.c +10
-0@@ -1514,6 +1514,7 @@ void transport_generic_request_failure(struct se_cmd *cmd,case TCM_UNSUPPORTED_SCSI_OPCODE :case TCM_INVALID_CDB_FIELD :case TCM_INVALID_PARAMETER_LIST : +case TCM_PARAMETER_LIST_LENGTH_ERROR :case TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE :case TCM_UNKNOWN_MODE_PAGE :case TCM_WRITE_PROTECTED :@@ -2674,6 +2675,15 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd,/* INVALID FIELD IN PARAMETER LIST */ buffer[SPC_ASC_KEY_OFFSET ] =0x26 ;break ; +case TCM_PARAMETER_LIST_LENGTH_ERROR : +/* CURRENT ERROR */ + buffer[0 ] =0x70 ; + buffer[SPC_ADD_SENSE_LEN_OFFSET ] =10 ; +/* ILLEGAL REQUEST */ + buffer[SPC_SENSE_KEY_OFFSET ] =ILLEGAL_REQUEST ; +/* INVALID FIELD IN PARAMETER LIST */ + buffer[SPC_ASC_KEY_OFFSET ] =0x1a ; +break ;case TCM_UNEXPECTED_UNSOLICITED_DATA :/* CURRENT ERROR */ buffer[0 ] =0x70 ;include/target/target_core_base.h +1
-0@@ -193,6 +193,7 @@ enum tcm_sense_reason_table {TCM_RESERVATION_CONFLICT =R (0x10 ),TCM_ADDRESS_OUT_OF_RANGE =R (0x11 ),TCM_OUT_OF_RESOURCES =R (0x12 ), +TCM_PARAMETER_LIST_LENGTH_ERROR =R (0x13 ), #undef R };
PATCH 3/3 target: Fix parameter list length checking in MODE SELECT
In reply to Roland DreierFrom: Roland Dreier <[email protected]>
An empty parameter list (length == 0) is not an error, so succeed MODE SELECT in this case. If the parameter list length is too small, return the correct sense code of PARAMETER LIST LENGTH ERROR.
--- drivers/target/target_core_spc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/target/target_core_spc.c +13 -0
@@ -983,6 +983,14 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd)int ret =0 ;int i; +if (!cmd->data_length) { +target_complete_cmd (cmd,GOOD ); +return 0 ; + } + +if (cmd->data_length < off +2 ) +return TCM_PARAMETER_LIST_LENGTH_ERROR ; + buf =transport_kmap_data_sg (cmd);if (!buf)return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;
@@ -1007,6 +1015,11 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd) goto out; check_contents: +if (cmd->data_length < off + length) { + ret =TCM_PARAMETER_LIST_LENGTH_ERROR ; + goto out; + } +if (memcmp (buf + off, tbuf, length)) ret =TCM_INVALID_PARAMETER_LIST ;
Signature · 1 line
1.8.1.2
Nicholas A. Bellinger
AppliedRe: [PATCH 3/3] target: Fix parameter list length checking in MODE SELECT
Quoted 8 lines · Roland Dreier
From: Roland Dreier <[email protected]>
An empty parameter list (length == 0) is not an error, so succeed MODE SELECT in this case. If the parameter list length is too small, return the correct sense code of PARAMETER LIST LENGTH ERROR.
Signed-off-by Roland Dreier <[email protected]>---
Applied.
Thanks Roland!
--nab
Quoted 34 lines
drivers/target/target_core_spc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/target/target_core_spc.c +13
-0@@ -983,6 +983,14 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd)int ret =0 ;int i; +if (!cmd->data_length) { +target_complete_cmd (cmd,GOOD ); +return 0 ; + } + +if (cmd->data_length < off +2 ) +return TCM_PARAMETER_LIST_LENGTH_ERROR ; + buf =transport_kmap_data_sg (cmd);if (!buf)return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ;@@ -1007,6 +1015,11 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd) goto out; check_contents: +if (cmd->data_length < off + length) { + ret =TCM_PARAMETER_LIST_LENGTH_ERROR ; + goto out; + } +if (memcmp (buf + off, tbuf, length)) ret =TCM_INVALID_PARAMETER_LIST ;
Hi Roland,
Quoted 7 lines · Roland Dreier
From: Roland Dreier <[email protected]>
We're supposed to return LOGICAL BLOCK ADDRESS OUT OF RANGE, not INVALID FIELD IN CDB.
Signed-off-by Roland Dreier <[email protected]>---
Apologies for the delayed response. Applied to target-pending/for-next.
Thank you,
--nab
Quoted 16 lines
drivers/target/target_core_sbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/target/target_core_sbc.c +1
-1@@ -486,7 +486,7 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)*/ if (cmd->t_task_lba || sectors) {if (sbc_check_valid_sectors (cmd) <0 ) -return TCM_INVALID_CDB_FIELD ; +return TCM_ADDRESS_OUT_OF_RANGE ; } cmd->execute_cmd = ops->execute_sync_cache;break ;