diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-12-05 02:43:57 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-12-05 03:11:36 -0500 |
commit | 0ff8754981261a80f4b77db2536dfea92c2d4539 (patch) | |
tree | 47f1e6c46a77542fabc39ec3003183a5847045cf /drivers/target | |
parent | 3e4f574857eebce60bb56d7524f3f9eaa2a126d0 (diff) |
target: Add link_magic for fabric allow_link destination target_items
This patch adds [dev,lun]_link_magic value assignment + checks within generic
target_fabric_port_link() and target_fabric_mappedlun_link() code to ensure
destination config_item *target_item sent from configfs_symlink() ->
config_item_operations->allow_link() is the underlying se_device->dev_group
and se_lun->lun_group that we expect to symlink.
Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/target_core_device.c | 1 | ||||
-rw-r--r-- | drivers/target/target_core_fabric_configfs.c | 12 | ||||
-rw-r--r-- | drivers/target/target_core_tpg.c | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index 3f604393d89c..e2695101bb99 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c | |||
@@ -1352,6 +1352,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) | |||
1352 | if (!dev) | 1352 | if (!dev) |
1353 | return NULL; | 1353 | return NULL; |
1354 | 1354 | ||
1355 | dev->dev_link_magic = SE_DEV_LINK_MAGIC; | ||
1355 | dev->se_hba = hba; | 1356 | dev->se_hba = hba; |
1356 | dev->transport = hba->transport; | 1357 | dev->transport = hba->transport; |
1357 | 1358 | ||
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index 9c6791734ee8..810263dfa4a1 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c | |||
@@ -70,6 +70,12 @@ static int target_fabric_mappedlun_link( | |||
70 | struct se_portal_group *se_tpg; | 70 | struct se_portal_group *se_tpg; |
71 | struct config_item *nacl_ci, *tpg_ci, *tpg_ci_s, *wwn_ci, *wwn_ci_s; | 71 | struct config_item *nacl_ci, *tpg_ci, *tpg_ci_s, *wwn_ci, *wwn_ci_s; |
72 | int ret = 0, lun_access; | 72 | int ret = 0, lun_access; |
73 | |||
74 | if (lun->lun_link_magic != SE_LUN_LINK_MAGIC) { | ||
75 | pr_err("Bad lun->lun_link_magic, not a valid lun_ci pointer:" | ||
76 | " %p to struct lun: %p\n", lun_ci, lun); | ||
77 | return -EFAULT; | ||
78 | } | ||
73 | /* | 79 | /* |
74 | * Ensure that the source port exists | 80 | * Ensure that the source port exists |
75 | */ | 81 | */ |
@@ -742,6 +748,12 @@ static int target_fabric_port_link( | |||
742 | struct target_fabric_configfs *tf; | 748 | struct target_fabric_configfs *tf; |
743 | int ret; | 749 | int ret; |
744 | 750 | ||
751 | if (dev->dev_link_magic != SE_DEV_LINK_MAGIC) { | ||
752 | pr_err("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:" | ||
753 | " %p to struct se_device: %p\n", se_dev_ci, dev); | ||
754 | return -EFAULT; | ||
755 | } | ||
756 | |||
745 | tpg_ci = &lun_ci->ci_parent->ci_group->cg_item; | 757 | tpg_ci = &lun_ci->ci_parent->ci_group->cg_item; |
746 | se_tpg = container_of(to_config_group(tpg_ci), | 758 | se_tpg = container_of(to_config_group(tpg_ci), |
747 | struct se_portal_group, tpg_group); | 759 | struct se_portal_group, tpg_group); |
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c index d84cc0a8739e..0163309e2aba 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c | |||
@@ -669,6 +669,7 @@ int core_tpg_register( | |||
669 | for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) { | 669 | for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) { |
670 | lun = se_tpg->tpg_lun_list[i]; | 670 | lun = se_tpg->tpg_lun_list[i]; |
671 | lun->unpacked_lun = i; | 671 | lun->unpacked_lun = i; |
672 | lun->lun_link_magic = SE_LUN_LINK_MAGIC; | ||
672 | lun->lun_status = TRANSPORT_LUN_STATUS_FREE; | 673 | lun->lun_status = TRANSPORT_LUN_STATUS_FREE; |
673 | atomic_set(&lun->lun_acl_count, 0); | 674 | atomic_set(&lun->lun_acl_count, 0); |
674 | init_completion(&lun->lun_shutdown_comp); | 675 | init_completion(&lun->lun_shutdown_comp); |