aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2014-09-17 11:45:17 -0700
committerBen Hutchings <ben@decadent.org.uk>2014-11-05 20:27:44 +0000
commit9c0e738c62a1b547590b5c4ce3ccf23cec371284 (patch)
tree61eb0731218f963ab655ef6a5301d5858a774d90 /drivers/target
parent1a4ba51a1d7def5f36b7dec2defd3c4ab27e9fb0 (diff)
downloadkernel_samsung_smdk4412-9c0e738c62a1b547590b5c4ce3ccf23cec371284.zip
kernel_samsung_smdk4412-9c0e738c62a1b547590b5c4ce3ccf23cec371284.tar.gz
kernel_samsung_smdk4412-9c0e738c62a1b547590b5c4ce3ccf23cec371284.tar.bz2
iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid
commit b53b0d99d6fbf7d44330395349a895521cfdbc96 upstream. This patch fixes a bug in iscsit_logout_post_handler_diffcid() where a pointer used as storage for list_for_each_entry() was incorrectly being used to determine if no matching entry had been found. This patch changes iscsit_logout_post_handler_diffcid() to key off bool conn_found to determine if the function needs to exit early. Reported-by: Joern Engel <joern@logfs.org> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/iscsi/iscsi_target.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index ab5dd16..ae4e7da 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -4306,6 +4306,7 @@ static void iscsit_logout_post_handler_diffcid(
{
struct iscsi_conn *l_conn;
struct iscsi_session *sess = conn->sess;
+ bool conn_found = false;
if (!sess)
return;
@@ -4314,12 +4315,13 @@ static void iscsit_logout_post_handler_diffcid(
list_for_each_entry(l_conn, &sess->sess_conn_list, conn_list) {
if (l_conn->cid == cid) {
iscsit_inc_conn_usage_count(l_conn);
+ conn_found = true;
break;
}
}
spin_unlock_bh(&sess->conn_lock);
- if (!l_conn)
+ if (!conn_found)
return;
if (l_conn->sock)