summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Kohl <Riedel-und-Kohl@t-online.de>2012-05-13 23:39:37 +0200
committerNicholas Bellinger <nab@linux-iscsi.org>2012-05-14 15:13:50 -0700
commitedc318d9fea6854df752ec8c645b960b0d5a1d23 (patch)
tree0b36996acd203023c98c627ec90cee41abf70f49
parentcfebf8f42f47327fa54cf05c19b98f4bd5236a26 (diff)
downloadlinux-3.10-edc318d9fea6854df752ec8c645b960b0d5a1d23.tar.gz
linux-3.10-edc318d9fea6854df752ec8c645b960b0d5a1d23.tar.bz2
linux-3.10-edc318d9fea6854df752ec8c645b960b0d5a1d23.zip
target: Fix SPC-2 RELEASE bug for multi-session iSCSI client setups
This patch addresses a bug in a special case for target core SPC-2 RELEASE logic where the same physical client (eg: iSCSI InitiatorName) with differing iSCSI session identifiers (ISID) is allowed to incorrectly release the same client's SPC-2 reservation from the non reservation holding path. Note this bug is specific to iscsi-target w/ SPC-2 reservations, and with the default enforce_pr_isids=1 device attr setting in target-core controls if a InitiatorName + different ISID reservations are handled the same as a single iSCSI client entity. Signed-off-by: Bernhard Kohl <bernhard.kohl@gmx.net> Cc: <stable@vger.kernel.org> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/target_core_pr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 86f0c3b5d50..c3148b10b4b 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -220,6 +220,9 @@ int target_scsi2_reservation_release(struct se_task *task)
if (dev->dev_reserved_node_acl != sess->se_node_acl)
goto out_unlock;
+ if (dev->dev_res_bin_isid != sess->sess_bin_isid)
+ goto out_unlock;
+
dev->dev_reserved_node_acl = NULL;
dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
if (dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID) {