]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
authorFred Herard <fred.herard@oracle.com>
Fri, 16 Nov 2018 17:50:13 +0000 (09:50 -0800)
committerBrian Maly <brian.maly@oracle.com>
Tue, 18 Dec 2018 00:07:10 +0000 (19:07 -0500)
This commit addresses NULL pointer dereference in iscsi_eh_session_reset.
Reference should not be made to session->leadconn when session->state
is set to ISCSI_STATE_TERMINATE.

Orabug: 28946207

Signed-off-by: Fred Herard <fred.herard@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
(cherry picked from commit 315b38414a1a6830740d0bf27eab034c989f7563)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
drivers/scsi/libiscsi.c

Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/scsi/libiscsi.c

index 3d58d02cacae677135c1f64382b7f460bf7cc164..e7a95a58570aa07a3814e8474afd3c76b347a979 100644 (file)
@@ -2346,8 +2346,8 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc)
 failed:
                ISCSI_DBG_EH(session,
                             "failing session reset: Could not log back into "
-                            "%s, %s [age %d]\n", session->targetname,
-                            conn->persistent_address, session->age);
+                            "%s [age %d]\n", session->targetname,
+                            session->age);
                spin_unlock_bh(&session->lock);
                mutex_unlock(&session->eh_mutex);
                return FAILED;