|
@@ -1160,15 +1160,28 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)
|
|
|
if (cmd->unknown_data_length) {
|
|
|
cmd->data_length = size;
|
|
|
} else if (size != cmd->data_length) {
|
|
|
- pr_warn("TARGET_CORE[%s]: Expected Transfer Length:"
|
|
|
+ pr_warn_ratelimited("TARGET_CORE[%s]: Expected Transfer Length:"
|
|
|
" %u does not match SCSI CDB Length: %u for SAM Opcode:"
|
|
|
" 0x%02x\n", cmd->se_tfo->get_fabric_name(),
|
|
|
cmd->data_length, size, cmd->t_task_cdb[0]);
|
|
|
|
|
|
- if (cmd->data_direction == DMA_TO_DEVICE &&
|
|
|
- cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
|
|
|
- pr_err("Rejecting underflow/overflow WRITE data\n");
|
|
|
- return TCM_INVALID_CDB_FIELD;
|
|
|
+ if (cmd->data_direction == DMA_TO_DEVICE) {
|
|
|
+ if (cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) {
|
|
|
+ pr_err_ratelimited("Rejecting underflow/overflow"
|
|
|
+ " for WRITE data CDB\n");
|
|
|
+ return TCM_INVALID_CDB_FIELD;
|
|
|
+ }
|
|
|
+ /*
|
|
|
+ * Some fabric drivers like iscsi-target still expect to
|
|
|
+ * always reject overflow writes. Reject this case until
|
|
|
+ * full fabric driver level support for overflow writes
|
|
|
+ * is introduced tree-wide.
|
|
|
+ */
|
|
|
+ if (size > cmd->data_length) {
|
|
|
+ pr_err_ratelimited("Rejecting overflow for"
|
|
|
+ " WRITE control CDB\n");
|
|
|
+ return TCM_INVALID_CDB_FIELD;
|
|
|
+ }
|
|
|
}
|
|
|
/*
|
|
|
* Reject READ_* or WRITE_* with overflow/underflow for
|