[PATCH 3.16 098/346] iscsi-target: Fix panic when adding second TCP connection to iSCSI session

From: Ben Hutchings
Date: Sun Nov 13 2016 - 22:49:15 EST


3.16.39-rc1 review patch. If anyone has any objections, please let me know.

------------------

From: Feng Li <lifeng1519@xxxxxxxxx>

commit 8abc718de6e9e52d8a6bfdb735060554aeae25e4 upstream.

In MC/S scenario, the conn->sess has been set NULL in
iscsi_login_non_zero_tsih_s1 when the second connection comes here,
then kernel panic.

The conn->sess will be assigned in iscsi_login_non_zero_tsih_s2. So
we should check whether it's NULL before calling.

Signed-off-by: Feng Li <lifeng1519@xxxxxxxxx>
Tested-by: Sumit Rai <sumit.rai@xxxxxxxxxxxxxx>
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
drivers/target/iscsi/iscsi_target_login.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -1418,8 +1418,9 @@ static int __iscsi_target_login_thread(s
}
login->zero_tsih = zero_tsih;

- conn->sess->se_sess->sup_prot_ops =
- conn->conn_transport->iscsit_get_sup_prot_ops(conn);
+ if (conn->sess)
+ conn->sess->se_sess->sup_prot_ops =
+ conn->conn_transport->iscsit_get_sup_prot_ops(conn);

tpg = conn->tpg;
if (!tpg) {