1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index e166d547a341..7b0a8ab71049 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -1123,7 +1123,12 @@ be_complete_io(struct beiscsi_conn *beiscsi_conn,
                                                 & SOL_STS_MASK) >> 8);
         flags = ((psol->dw[offsetof(struct amap_sol_cqe, i_flags) / 32]
                                         & SOL_FLAGS_MASK) >> 24) | 0x80;
+        if (!task->sc) {
+                if (io_task->scsi_cmnd)
+                        scsi_dma_unmap(io_task->scsi_cmnd);
 
+                return;
+        }
         task->sc->result = (DID_OK << 16) | status;
         if (rsp != ISCSI_STATUS_CMD_COMPLETED) {
                 task->sc->result = DID_ERROR << 16;