3 files changed, 21 insertions, 1 deletions

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 2f74e17ad3e6..facee5f74fa4 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -391,10 +391,19 @@ iblock_execute_unmap(struct se_cmd *cmd)
         sense_reason_t ret = 0;
         int dl, bd_dl, err;
 
+        /* We never set ANC_SUP */
+        if (cmd->t_task_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);
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 96b64d57ebbb..2030b608136d 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1517,6 +1517,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:
@@ -2677,6 +2678,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;
+                /* PARAMETER LIST LENGTH ERROR */
+                buffer[SPC_ASC_KEY_OFFSET] = 0x1a;
+                break;
         case TCM_UNEXPECTED_UNSOLICITED_DATA:
                 /* CURRENT ERROR */
                 buffer[0] = 0x70;
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index df14dce59191..c4af592f7057 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -195,6 +195,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
 };