diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2009-03-05 14:46:07 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-03-13 15:29:54 -0500 |
| commit | 728996829b3e2a3bbacb7390e6c040dd839cdf21 (patch) | |
| tree | e2e0b41faa980aeb78c0cd407dec26c73a8c7514 /drivers/scsi | |
| parent | 5e7facb77ff4b6961d936773fb1f175f7abf76b7 (diff) | |
| download | linux-728996829b3e2a3bbacb7390e6c040dd839cdf21.tar.gz linux-728996829b3e2a3bbacb7390e6c040dd839cdf21.tar.bz2 linux-728996829b3e2a3bbacb7390e6c040dd839cdf21.zip | |
[SCSI] libiscsi: fix possbile null ptr session command cleanup
If the iscsi eh fires when the current task is a nop, then
the task->sc pointer is null. fail_all_commands could
then try to do task->sc->device and oops. We actually do
not need to access the curr task in this path, because
if it is a cmd task the fail_command call will handle
this and if it is mgmt task then the flush of the mgmt
queues will handle that.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index d07017911139..dfaa8adf099e 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1603,8 +1603,11 @@ static void fail_all_commands(struct iscsi_conn *conn, unsigned lun, { struct iscsi_task *task, *tmp; - if (conn->task && (conn->task->sc->device->lun == lun || lun == -1)) - conn->task = NULL; + if (conn->task) { + if (lun == -1 || + (conn->task->sc && conn->task->sc->device->lun == lun)) + conn->task = NULL; + } /* flush pending */ list_for_each_entry_safe(task, tmp, &conn->xmitqueue, running) { |