warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ISCSI fix broken send logic in iscsi_scsi_async_command

Browse Source 
The send logic was completely broken for any cases except
ISCSI_INITIAL_R2T_NO and ISCSI_IMMEDIATE_DATA_YES.
The final flag was set wrong or no data was sent.

It was also broken if the data did not fit into the cmd_pdu as
the consecutive pdus did not have the scsi_cbdata set which
lead to a segfault in iscsi_get_user_out_buffer().

Unfortunately we need to include scsi-lowlevel.h again in iscsi-private.h.
This should be fixed asap by introduction of an iscsi_task struct
to avoid to store iscsi relevant data in the scsi_task.

Signed-off-by: Peter Lieven <pl@kamp.de>

Conflicts:

	lib/iscsi-command.c

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2012-11-27 11:16:38 +01:00
parent b1da7311c4
commit 548bd22f51
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/iscsi-private.h
+4
View File
@@ -19,6 +19,8 @@
#include <stdint.h> #include <stdint.h>
#include <time.h> #include <time.h>
/* We need this until we have an iscsi_task to get access to the iovector_out */
#include "scsi-lowlevel.h"
#if defined(WIN32) #if defined(WIN32)
#include <basetsd.h> #include <basetsd.h>
@@ -219,6 +221,8 @@ struct iscsi_pdu {
int written; int written;
struct scsi_task *task; /* Reference to scsi_task to get iov with output data */
struct iscsi_data outdata; /* Header for PDU to send */ struct iscsi_data outdata; /* Header for PDU to send */
uint32_t out_offset; /* Offset into data-out iovector */ uint32_t out_offset; /* Offset into data-out iovector */
uint32_t out_len; /* Amount of data to sent */ uint32_t out_len; /* Amount of data to sent */
lib/iscsi-command.c
+7 -3
View File
@@ -115,6 +115,7 @@ iscsi_send_data_out(struct iscsi_context *iscsi, struct iscsi_pdu *cmd_pdu,
pdu->callback = cmd_pdu->callback; pdu->callback = cmd_pdu->callback;
pdu->private_data = cmd_pdu->private_data; pdu->private_data = cmd_pdu->private_data;
pdu->task = cmd_pdu->task;
if (iscsi_queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
@@ -180,6 +181,8 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
return -1; return -1;
} }
pdu->task = task;
pdu->scsi_cbdata.task = task; pdu->scsi_cbdata.task = task;
pdu->scsi_cbdata.callback = cb; pdu->scsi_cbdata.callback = cb;
pdu->scsi_cbdata.private_data = private_data; pdu->scsi_cbdata.private_data = private_data;
@@ -203,6 +206,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
if (len > iscsi->first_burst_length) { if (len > iscsi->first_burst_length) {
len = iscsi->first_burst_length; len = iscsi->first_burst_length;
flags &= ~ISCSI_PDU_SCSI_FINAL;
} }
pdu->out_offset = 0; pdu->out_offset = 0;
@@ -210,7 +214,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
/* update data segment length */ /* update data segment length */
scsi_set_uint32(&pdu->outdata.data[4], pdu->out_len); scsi_set_uint32(&pdu->outdata.data[4], pdu->out_len);
} else if (iscsi->use_initial_r2t == ISCSI_INITIAL_R2T_NO) { } else if (task->iovector_out.niov > 0 && iscsi->use_initial_r2t == ISCSI_INITIAL_R2T_NO) {
/* We have more data to send, and we are allowed to send /* We have more data to send, and we are allowed to send
* unsolicited data, so dont flag this PDU as final. * unsolicited data, so dont flag this PDU as final.
*/ */
@@ -249,7 +253,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
} }
/* Can we send some unsolicited data ? */ /* Can we send some unsolicited data ? */
if (pdu->out_len != 0 && iscsi->use_initial_r2t == ISCSI_INITIAL_R2T_NO && iscsi->use_immediate_data == ISCSI_IMMEDIATE_DATA_NO) { if (task->iovector_out.niov > 0 && iscsi->use_initial_r2t == ISCSI_INITIAL_R2T_NO && iscsi->use_immediate_data == ISCSI_IMMEDIATE_DATA_NO) {
uint32_t len = task->expxferlen - pdu->out_len; uint32_t len = task->expxferlen - pdu->out_len;
if (len > iscsi->first_burst_length) { if (len > iscsi->first_burst_length) {
@@ -1582,6 +1586,6 @@ iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi)
unsigned char * unsigned char *
iscsi_get_user_out_buffer(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu, uint32_t pos, ssize_t *count) iscsi_get_user_out_buffer(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu, uint32_t pos, ssize_t *count)
{ {
return scsi_task_get_data_out_buffer(pdu->scsi_cbdata.task, pos, count); return scsi_task_get_data_out_buffer(pdu->task, pos, count);
} }