From 94ae1d6db9cc0b22876c026f6b3ea328d867b588 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 20 Mar 2009 18:40:55 +0000 Subject: [PATCH] Fixes possible oopses on scst_cmd dereference. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@708 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 1 - iscsi-scst/kernel/nthread.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index dc74c17a1..eeafbe555 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -297,7 +297,6 @@ void cmnd_done(struct iscsi_cmnd *cmnd) } } } else { - EXTRACHECKS_BUG_ON(cmnd->scst_cmd != NULL); TRACE_DBG("Deleting rsp %p from parent %p", cmnd, cmnd->parent_req); diff --git a/iscsi-scst/kernel/nthread.c b/iscsi-scst/kernel/nthread.c index 9432adde0..8b8a4f48d 100644 --- a/iscsi-scst/kernel/nthread.c +++ b/iscsi-scst/kernel/nthread.c @@ -273,7 +273,8 @@ static void trace_conn_close(struct iscsi_conn *conn) "data_waiting %d, ref_cnt %d, sn %u, " "parent_req %p, pending %d", cmnd, cmnd->scst_state, - cmnd->scst_cmd ? cmnd->scst_cmd->state : -1, + (cmnd->parent_req && cmnd->scst_cmd) ? + cmnd->scst_cmd->state : -1, cmnd->data_waiting, atomic_read(&cmnd->ref_cnt), cmnd->pdu.bhs.sn, cmnd->parent_req, cmnd->pending); #if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)