summaryrefslogtreecommitdiff
path: root/drivers/target
diff options
context:
space:
mode:
authorFeng Li <lifeng1519@gmail.com>2016-07-12 06:15:44 +0800
committerSasha Levin <alexander.levin@verizon.com>2016-08-22 12:23:16 -0400
commit7b37bc27c5c15495e601569bbe22e90744b13467 (patch)
treecb07cc1cdf32716cacbc47089f094c71d4a6afc5 /drivers/target
parent3f4976f0e610b010e9e69ff294212ce6b7fc7ca5 (diff)
downloadlinux-rt-7b37bc27c5c15495e601569bbe22e90744b13467.tar.gz
iscsi-target: Fix panic when adding second TCP connection to iSCSI session
[ Upstream commit 8abc718de6e9e52d8a6bfdb735060554aeae25e4 ] 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@gmail.com> Tested-by: Sumit Rai <sumit.rai@calsoftinc.com> Cc: stable@vger.kernel.org # 3.14+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/iscsi/iscsi_target_login.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index eb320e6eb93d..b06d3c0d2e66 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -1414,8 +1414,9 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
}
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) {