aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2015-07-22 03:24:09 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2015-07-24 17:19:43 -0400
commit417c20a9bdd1e876384127cf096d8ae8b559066c (patch)
treedc8c04ab25bf7d0d987f3fdb228fd361ed8e2364
parent7359df25a53386dd33c223672bbd12cb49d0ce4f (diff)
iscsi-target: Fix use-after-free during TPG session shutdown
This patch fixes a use-after-free bug in iscsit_release_sessions_for_tpg() where se_portal_group->session_lock was incorrectly released/re-acquired while walking the active se_portal_group->tpg_sess_list. The can result in a NULL pointer dereference when iscsit_close_session() shutdown happens in the normal path asynchronously to this code, causing a bogus dereference of an already freed list entry to occur. To address this bug, walk the session list checking for the same state as before, but move entries to a local list to avoid dropping the lock while walking the active list. As before, signal using iscsi_session->session_restatement=1 for those list entries to be released locally by iscsit_free_session() code. Reported-by: Sunilkumar Nadumuttlu <sjn@datera.io> Cc: Sunilkumar Nadumuttlu <sjn@datera.io> Cc: <stable@vger.kernel.org> # v3.1+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/iscsi/iscsi_target.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 4e68b62193ed..afab32376126 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4765,6 +4765,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
4765 struct iscsi_session *sess; 4765 struct iscsi_session *sess;
4766 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; 4766 struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
4767 struct se_session *se_sess, *se_sess_tmp; 4767 struct se_session *se_sess, *se_sess_tmp;
4768 LIST_HEAD(free_list);
4768 int session_count = 0; 4769 int session_count = 0;
4769 4770
4770 spin_lock_bh(&se_tpg->session_lock); 4771 spin_lock_bh(&se_tpg->session_lock);
@@ -4786,14 +4787,17 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
4786 } 4787 }
4787 atomic_set(&sess->session_reinstatement, 1); 4788 atomic_set(&sess->session_reinstatement, 1);
4788 spin_unlock(&sess->conn_lock); 4789 spin_unlock(&sess->conn_lock);
4789 spin_unlock_bh(&se_tpg->session_lock);
4790 4790
4791 iscsit_free_session(sess); 4791 list_move_tail(&se_sess->sess_list, &free_list);
4792 spin_lock_bh(&se_tpg->session_lock); 4792 }
4793 spin_unlock_bh(&se_tpg->session_lock);
4793 4794
4795 list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {
4796 sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;
4797
4798 iscsit_free_session(sess);
4794 session_count++; 4799 session_count++;
4795 } 4800 }
4796 spin_unlock_bh(&se_tpg->session_lock);
4797 4801
4798 pr_debug("Released %d iSCSI Session(s) from Target Portal" 4802 pr_debug("Released %d iSCSI Session(s) from Target Portal"
4799 " Group: %hu\n", session_count, tpg->tpgt); 4803 " Group: %hu\n", session_count, tpg->tpgt);