From: Fred Herard <fred.herard@oracle.com>
Date: Fri, 16 Nov 2018 17:50:13 +0000 (-0800)
Subject: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
X-Git-Tag: v4.1.12-124.31.3~374
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d9c16d234a7acd1b2b314b5db81a4c73a69c5ab6;p=users%2Fjedix%2Flinux-maple.git

libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset

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>
---

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 3d58d02cacae6..e7a95a58570aa 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -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;