Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull SCSI target fixes from Nicholas Bellinger: "The first patch is to address a long standing issue where INQUIRY vendor + model response data was not correctly padded with ASCII spaces, causing MSFT and Falconstor multipath stacks to not function with our LUNs. The second -> forth patches are additional iscsi-target regression fixes for the post >= v3.10 iser-target changes. The second and third are failure cases that have appeared during further testing, and the forth is only reproducible with malformed NOP packets. The fifth patch is a v3.11 specific regression caused by a recent optimization that showed up during WRITE I/O failure testing. I'll be sending Patch #1 and Patch #5 to Greg-KH separately for stable" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: Fix se_cmd->state_list leak regression during WRITE failure iscsi-target: Fix potential NULL pointer in solicited NOPOUT reject iscsi-target: Fix iscsit_transport reference leak during NP thread reset iscsi-target: Fix ImmediateData=Yes failure regression in >= v3.10 target: Fix trailing ASCII space usage in INQUIRY vendor+model
This commit is contained in:
commit
dcaaaeac87
4 changed files with 31 additions and 15 deletions
|
@ -1086,7 +1086,6 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
|
||||||
if (cmd->reject_reason)
|
if (cmd->reject_reason)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
@ -1124,14 +1123,10 @@ after_immediate_data:
|
||||||
*/
|
*/
|
||||||
cmdsn_ret = iscsit_sequence_cmd(cmd->conn, cmd,
|
cmdsn_ret = iscsit_sequence_cmd(cmd->conn, cmd,
|
||||||
(unsigned char *)hdr, hdr->cmdsn);
|
(unsigned char *)hdr, hdr->cmdsn);
|
||||||
if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) {
|
if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)
|
||||||
return -1;
|
return -1;
|
||||||
} else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) {
|
|
||||||
target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cmd->sense_reason) {
|
if (cmd->sense_reason || cmdsn_ret == CMDSN_LOWER_THAN_EXP) {
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = iscsit_dump_data_payload(cmd->conn,
|
rc = iscsit_dump_data_payload(cmd->conn,
|
||||||
|
@ -1527,6 +1522,10 @@ int iscsit_setup_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
|
||||||
if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) {
|
if (hdr->itt == RESERVED_ITT && !(hdr->opcode & ISCSI_OP_IMMEDIATE)) {
|
||||||
pr_err("NOPOUT ITT is reserved, but Immediate Bit is"
|
pr_err("NOPOUT ITT is reserved, but Immediate Bit is"
|
||||||
" not set, protocol error.\n");
|
" not set, protocol error.\n");
|
||||||
|
if (!cmd)
|
||||||
|
return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR,
|
||||||
|
(unsigned char *)hdr);
|
||||||
|
|
||||||
return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR,
|
return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR,
|
||||||
(unsigned char *)hdr);
|
(unsigned char *)hdr);
|
||||||
}
|
}
|
||||||
|
@ -1536,6 +1535,10 @@ int iscsit_setup_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
|
||||||
" greater than MaxXmitDataSegmentLength: %u, protocol"
|
" greater than MaxXmitDataSegmentLength: %u, protocol"
|
||||||
" error.\n", payload_length,
|
" error.\n", payload_length,
|
||||||
conn->conn_ops->MaxXmitDataSegmentLength);
|
conn->conn_ops->MaxXmitDataSegmentLength);
|
||||||
|
if (!cmd)
|
||||||
|
return iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR,
|
||||||
|
(unsigned char *)hdr);
|
||||||
|
|
||||||
return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR,
|
return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR,
|
||||||
(unsigned char *)hdr);
|
(unsigned char *)hdr);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1163,12 +1163,11 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
|
||||||
if (np->np_thread_state == ISCSI_NP_THREAD_RESET) {
|
if (np->np_thread_state == ISCSI_NP_THREAD_RESET) {
|
||||||
spin_unlock_bh(&np->np_thread_lock);
|
spin_unlock_bh(&np->np_thread_lock);
|
||||||
complete(&np->np_restart_comp);
|
complete(&np->np_restart_comp);
|
||||||
if (ret == -ENODEV) {
|
iscsit_put_transport(conn->conn_transport);
|
||||||
iscsit_put_transport(conn->conn_transport);
|
kfree(conn);
|
||||||
kfree(conn);
|
conn = NULL;
|
||||||
conn = NULL;
|
if (ret == -ENODEV)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
/* Get another socket */
|
/* Get another socket */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,9 +97,12 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf)
|
||||||
|
|
||||||
buf[7] = 0x2; /* CmdQue=1 */
|
buf[7] = 0x2; /* CmdQue=1 */
|
||||||
|
|
||||||
snprintf(&buf[8], 8, "LIO-ORG");
|
memcpy(&buf[8], "LIO-ORG ", 8);
|
||||||
snprintf(&buf[16], 16, "%s", dev->t10_wwn.model);
|
memset(&buf[16], 0x20, 16);
|
||||||
snprintf(&buf[32], 4, "%s", dev->t10_wwn.revision);
|
memcpy(&buf[16], dev->t10_wwn.model,
|
||||||
|
min_t(size_t, strlen(dev->t10_wwn.model), 16));
|
||||||
|
memcpy(&buf[32], dev->t10_wwn.revision,
|
||||||
|
min_t(size_t, strlen(dev->t10_wwn.revision), 4));
|
||||||
buf[4] = 31; /* Set additional length to 31 */
|
buf[4] = 31; /* Set additional length to 31 */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -2134,6 +2134,7 @@ static void transport_write_pending_qf(struct se_cmd *cmd)
|
||||||
|
|
||||||
int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
|
int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
|
||||||
{
|
{
|
||||||
|
unsigned long flags;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) {
|
if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) {
|
||||||
|
@ -2144,6 +2145,16 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
|
||||||
} else {
|
} else {
|
||||||
if (wait_for_tasks)
|
if (wait_for_tasks)
|
||||||
transport_wait_for_tasks(cmd);
|
transport_wait_for_tasks(cmd);
|
||||||
|
/*
|
||||||
|
* Handle WRITE failure case where transport_generic_new_cmd()
|
||||||
|
* has already added se_cmd to state_list, but fabric has
|
||||||
|
* failed command before I/O submission.
|
||||||
|
*/
|
||||||
|
if (cmd->state_active) {
|
||||||
|
spin_lock_irqsave(&cmd->t_state_lock, flags);
|
||||||
|
target_remove_from_state_list(cmd);
|
||||||
|
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
|
||||||
|
}
|
||||||
|
|
||||||
if (cmd->se_lun)
|
if (cmd->se_lun)
|
||||||
transport_lun_remove_cmd(cmd);
|
transport_lun_remove_cmd(cmd);
|
||||||
|
|
Loading…
Reference in a new issue