Commit a19a94df authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by Luis Henriques

iscsi-target: Fix use-after-free during TPG session shutdown

commit 417c20a9 upstream.

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: default avatarSunilkumar Nadumuttlu <sjn@datera.io>
Cc: Sunilkumar Nadumuttlu <sjn@datera.io>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 809f410c
...@@ -4736,6 +4736,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) ...@@ -4736,6 +4736,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
struct iscsi_session *sess; struct iscsi_session *sess;
struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
struct se_session *se_sess, *se_sess_tmp; struct se_session *se_sess, *se_sess_tmp;
LIST_HEAD(free_list);
int session_count = 0; int session_count = 0;
spin_lock_bh(&se_tpg->session_lock); spin_lock_bh(&se_tpg->session_lock);
...@@ -4757,14 +4758,17 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) ...@@ -4757,14 +4758,17 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
} }
atomic_set(&sess->session_reinstatement, 1); atomic_set(&sess->session_reinstatement, 1);
spin_unlock(&sess->conn_lock); spin_unlock(&sess->conn_lock);
spin_unlock_bh(&se_tpg->session_lock);
iscsit_free_session(sess); list_move_tail(&se_sess->sess_list, &free_list);
spin_lock_bh(&se_tpg->session_lock); }
spin_unlock_bh(&se_tpg->session_lock);
list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {
sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;
iscsit_free_session(sess);
session_count++; session_count++;
} }
spin_unlock_bh(&se_tpg->session_lock);
pr_debug("Released %d iSCSI Session(s) from Target Portal" pr_debug("Released %d iSCSI Session(s) from Target Portal"
" Group: %hu\n", session_count, tpg->tpgt); " Group: %hu\n", session_count, tpg->tpgt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment