aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target/iscsi/iscsi_target.c
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2016-01-08 01:09:27 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2016-01-20 04:34:15 -0500
commit21aaa23b0ebbd19334fa461370c03cbb076b3295 (patch)
treeee480a095123426c81a9aac8fed0fba8fe27fc74 /drivers/target/iscsi/iscsi_target.c
parentd36ad77f702356afb1009d2987b0ab55da4c7d57 (diff)
target: Obtain se_node_acl->acl_kref during get_initiator_node_acl
This patch addresses a long standing race where obtaining se_node_acl->acl_kref in __transport_register_session() happens a bit too late, and leaves open the potential for core_tpg_del_initiator_node_acl() to hit a NULL pointer dereference. Instead, take ->acl_kref in core_tpg_get_initiator_node_acl() while se_portal_group->acl_node_mutex is held, and move the final target_put_nacl() from transport_deregister_session() into transport_free_session() so that fabric driver login failure handling using the modern method to still work as expected. Also, update core_tpg_get_initiator_node_acl() to take an extra reference for dynamically generated acls for demo-mode, before returning to fabric caller. Also update iscsi-target sendtargets special case handling to use target_tpg_has_node_acl() when checking if demo_mode_discovery == true during discovery lookup. Note the existing wait_for_completion(&acl->acl_free_comp) in core_tpg_del_initiator_node_acl() does not change. Cc: Sagi Grimberg <sagig@mellanox.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.de> Cc: Andy Grover <agrover@redhat.com> Cc: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target.c')
-rw-r--r--drivers/target/iscsi/iscsi_target.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index a81c0e5ca293..762b2d6ea1cc 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3435,7 +3435,7 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
3435 3435
3436 if ((tpg->tpg_attrib.generate_node_acls == 0) && 3436 if ((tpg->tpg_attrib.generate_node_acls == 0) &&
3437 (tpg->tpg_attrib.demo_mode_discovery == 0) && 3437 (tpg->tpg_attrib.demo_mode_discovery == 0) &&
3438 (!core_tpg_get_initiator_node_acl(&tpg->tpg_se_tpg, 3438 (!target_tpg_has_node_acl(&tpg->tpg_se_tpg,
3439 cmd->conn->sess->sess_ops->InitiatorName))) { 3439 cmd->conn->sess->sess_ops->InitiatorName))) {
3440 continue; 3440 continue;
3441 } 3441 }