[SCSI] qla2xxx: Fix crash in qla2x00_abort_all_cmds() on unload
I hit a crash in qla2x00_abort_all_cmds() if the qla2xxx module is unloaded right after it is loaded. I debugged this down to the abort handling improperly treating a command of type SRB_ADISC_CMD as if it had a bsg_job to complete when that command actually uses the iocb_cmd part of the union. (I guess to hit this one has to unload the module while the async FC initialization is still in progress) It seems we should only look for a bsg_job if type is SRB_ELS_CMD_RPT, SRB_ELS_CMD_HST or SRB_CT_CMD, so switch the test to make that explicit. Signed-off-by: Roland Dreier <roland@purestorage.com> Acked-by: Chad Dupuis <chad.dupuis@qlogic.com> Cc: stable@kernel.org Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
f72a209a3e
commit
9bfacd01dc
1 changed files with 5 additions and 4 deletions
|
@ -1328,10 +1328,9 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
|
|||
qla2x00_sp_compl(ha, sp);
|
||||
} else {
|
||||
ctx = sp->ctx;
|
||||
if (ctx->type == SRB_LOGIN_CMD ||
|
||||
ctx->type == SRB_LOGOUT_CMD) {
|
||||
ctx->u.iocb_cmd->free(sp);
|
||||
} else {
|
||||
if (ctx->type == SRB_ELS_CMD_RPT ||
|
||||
ctx->type == SRB_ELS_CMD_HST ||
|
||||
ctx->type == SRB_CT_CMD) {
|
||||
struct fc_bsg_job *bsg_job =
|
||||
ctx->u.bsg_job;
|
||||
if (bsg_job->request->msgcode
|
||||
|
@ -1343,6 +1342,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
|
|||
kfree(sp->ctx);
|
||||
mempool_free(sp,
|
||||
ha->srb_mempool);
|
||||
} else {
|
||||
ctx->u.iocb_cmd->free(sp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue