Skip to content

Commit 934d0a9

Browse files
Nicholas Bellingergregkh
authored andcommitted
target: Re-add check to reject control WRITEs with overflow data
commit 4ff83daa0200affe1894bd33d17bac404e3d78d4 upstream. During v4.3 when the overflow/underflow check was relaxed by commit c72c525: commit c72c525 Author: Roland Dreier <roland@purestorage.com> Date: Wed Jul 22 15:08:18 2015 -0700 target: allow underflow/overflow for PR OUT etc. commands to allow underflow/overflow for Windows compliance + FCP, a consequence was to allow control CDBs to process overflow data for iscsi-target with immediate data as well. As per Roland's original change, continue to allow underflow cases for control CDBs to make Windows compliance + FCP happy, but until overflow for control CDBs is supported tree-wide, explicitly reject all control WRITEs with overflow following pre v4.3.y logic. Reported-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Roland Dreier <roland@purestorage.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 94d3daf commit 934d0a9

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

drivers/target/target_core_transport.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,15 +1154,28 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)
11541154
if (cmd->unknown_data_length) {
11551155
cmd->data_length = size;
11561156
} else if (size != cmd->data_length) {
1157-
pr_warn("TARGET_CORE[%s]: Expected Transfer Length:"
1157+
pr_warn_ratelimited("TARGET_CORE[%s]: Expected Transfer Length:"
11581158
" %u does not match SCSI CDB Length: %u for SAM Opcode:"
11591159
" 0x%02x\n", cmd->se_tfo->get_fabric_name(),
11601160
cmd->data_length, size, cmd->t_task_cdb[0]);
11611161

1162-
if (cmd->data_direction == DMA_TO_DEVICE &&
1163-
cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
1164-
pr_err("Rejecting underflow/overflow WRITE data\n");
1165-
return TCM_INVALID_CDB_FIELD;
1162+
if (cmd->data_direction == DMA_TO_DEVICE) {
1163+
if (cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
1164+
pr_err_ratelimited("Rejecting underflow/overflow"
1165+
" for WRITE data CDB\n");
1166+
return TCM_INVALID_CDB_FIELD;
1167+
}
1168+
/*
1169+
* Some fabric drivers like iscsi-target still expect to
1170+
* always reject overflow writes. Reject this case until
1171+
* full fabric driver level support for overflow writes
1172+
* is introduced tree-wide.
1173+
*/
1174+
if (size > cmd->data_length) {
1175+
pr_err_ratelimited("Rejecting overflow for"
1176+
" WRITE control CDB\n");
1177+
return TCM_INVALID_CDB_FIELD;
1178+
}
11661179
}
11671180
/*
11681181
* Reject READ_* or WRITE_* with overflow/underflow for

0 commit comments

Comments
 (0)