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

In iscsi_scsi_response_cb()

Browse Source 
dont pick task up from the argument, since this callback can be invoked
from places where we dont have/know the task strucutre and it is thus NULL.

Instead pick it up from scsi_cbstruct.

This prevents a SEGV when processing REJECT to SCSI commands.
(the scsi command callback dereferences the task pointer)
This commit is contained in:
Ronnie Sahlberg
2011-04-16 13:51:32 +10:00
parent 49dd0fb8b3
commit 024f7dc94e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scsi-command.c
View File

@@ -49,19 +49,19 @@ iscsi_scsi_response_cb(struct iscsi_context *iscsi, int status,
{ {
struct iscsi_scsi_cbdata *scsi_cbdata = struct iscsi_scsi_cbdata *scsi_cbdata =
(struct iscsi_scsi_cbdata *)private_data; (struct iscsi_scsi_cbdata *)private_data;
struct scsi_task *task = command_data;
switch (status) { switch (status) {
case SCSI_STATUS_RESERVATION_CONFLICT: case SCSI_STATUS_RESERVATION_CONFLICT:
case SCSI_STATUS_CHECK_CONDITION: case SCSI_STATUS_CHECK_CONDITION:
case SCSI_STATUS_GOOD: case SCSI_STATUS_GOOD:
scsi_cbdata->callback(iscsi, status, task, case SCSI_STATUS_ERROR:
scsi_cbdata->callback(iscsi, status, scsi_cbdata->task,
scsi_cbdata->private_data); scsi_cbdata->private_data);
return; return;
default: default:
iscsi_set_error(iscsi, "Cant handle scsi status %d yet.", iscsi_set_error(iscsi, "Cant handle scsi status %d yet.",
status); status);
scsi_cbdata->callback(iscsi, SCSI_STATUS_ERROR, task, scsi_cbdata->callback(iscsi, SCSI_STATUS_ERROR, scsi_cbdata->task,
scsi_cbdata->private_data); scsi_cbdata->private_data);
} }
} }