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

iscsi-test-cu: fix implicit DATA OUT buffers with SG_IO

Browse Source 
Command like PERSISTENT RESERVE OUT fill out DATA OUT data in their
CDB setup routine, but the SG_IO code doesn't look at that, leading
to a segfault when issueing such commands.  Fix this by copying over
some code from the iSCSI path.

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig
2015-04-18 15:37:44 +02:00
committed by Ronnie Sahlberg
parent e2e401c50c
commit b89f6592c4
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test-tool/iscsi-support.c
View File

@@ -227,6 +227,19 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
return task; return task;
} }
/* We got an actual buffer from the application. Convert it to
* a data-out iovector.
*/
if (d != NULL && d->data != NULL) {
struct scsi_iovec *iov;
iov = scsi_malloc(task, sizeof(struct scsi_iovec));
iov->iov_base = d->data;
iov->iov_len = d->size;
scsi_task_set_iov_out(task, iov, 1);
}
#ifdef HAVE_SG_IO #ifdef HAVE_SG_IO
if (sdev->sgio_dev) { if (sdev->sgio_dev) {
sg_io_hdr_t io_hdr; sg_io_hdr_t io_hdr;
@@ -253,8 +266,8 @@ static struct scsi_task *send_scsi_command(struct scsi_device *sdev, struct scsi
switch (task->xfer_dir) { switch (task->xfer_dir) {
case SCSI_XFER_WRITE: case SCSI_XFER_WRITE:
io_hdr.dxfer_direction = SG_DXFER_TO_DEV; io_hdr.dxfer_direction = SG_DXFER_TO_DEV;
io_hdr.dxferp = d->data; io_hdr.dxferp = task->iovector_out.iov;
io_hdr.dxfer_len = d->size; io_hdr.dxfer_len = task->iovector_out.niov;
break; break;
case SCSI_XFER_READ: case SCSI_XFER_READ:
io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;