mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
bb34e69f3d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 43d63ac69fcc86c6b92dc1b923a3b0e5bd59dab5 Mon Sep 17 00:00:00 2001
|
|
From: Nicholas Bellinger <nab@linux-iscsi.org>
|
|
Date: Sun, 26 Feb 2012 22:16:07 -0800
|
|
Subject: [PATCH 061/147] iscsi-target: Fix dynamic -> explict NodeACL pointer
|
|
reference
|
|
|
|
commit d06283341aee9e48eff1b068779d340785c635ce upstream.
|
|
|
|
This patch fixes a free after use in lio_target_make_nodeacl() where
|
|
iscsi_node_acl was referenced from the original se_nacl_new allocation,
|
|
instead of from core_tpg_add_initiator_node_acl() in the case of dynamic
|
|
-> explict NodeACL conversion.
|
|
|
|
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/target/iscsi/iscsi_target_configfs.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
|
|
index db32784..83dcf49 100644
|
|
--- a/drivers/target/iscsi/iscsi_target_configfs.c
|
|
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
|
|
@@ -816,9 +816,6 @@ static struct se_node_acl *lio_target_make_nodeacl(
|
|
if (!se_nacl_new)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
- acl = container_of(se_nacl_new, struct iscsi_node_acl,
|
|
- se_node_acl);
|
|
-
|
|
cmdsn_depth = ISCSI_TPG_ATTRIB(tpg)->default_cmdsn_depth;
|
|
/*
|
|
* se_nacl_new may be released by core_tpg_add_initiator_node_acl()
|
|
@@ -829,7 +826,8 @@ static struct se_node_acl *lio_target_make_nodeacl(
|
|
if (IS_ERR(se_nacl))
|
|
return se_nacl;
|
|
|
|
- stats_cg = &acl->se_node_acl.acl_fabric_stat_group;
|
|
+ acl = container_of(se_nacl, struct iscsi_node_acl, se_node_acl);
|
|
+ stats_cg = &se_nacl->acl_fabric_stat_group;
|
|
|
|
stats_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
|
|
GFP_KERNEL);
|
|
--
|
|
1.7.9.4
|
|
|