Patch "iscsi-target: Avoid OFMarker + IFMarker negotiation" has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

iscsi-target: Avoid OFMarker + IFMarker negotiation

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iscsi-target-avoid-ofmarker-ifmarker-negotiation.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Nicholas Bellinger <[email protected]>
Date: Tue, 22 Sep 2015 22:32:14 -0700
Subject: iscsi-target: Avoid OFMarker + IFMarker negotiation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Nicholas Bellinger <[email protected]>

commit 673681cafa99776e334c3e61cafa2cf115950c32 upstream.

This patch fixes a v4.2+ regression introduced by commit c04a6091 that removed support for obsolete sync-and-steering markers usage as originally defined in RFC-3720.

The regression would involve attempting to send OFMarker=No + IFMarker=No keys during opertional negotiation login phase, including when initiators did not actually propose these keys.

The result for MSFT iSCSI initiators would be random junk in TCP stream after the last successful login request was been sent signaling the move to full feature phase (FFP) operation.

To address this bug, go ahead and avoid negotiating these keys by default unless the initiator explicitly proposes them, but still respond to them with 'No' if they are proposed.

---
 drivers/target/iscsi/iscsi_target_parameters.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

@@ -407,6 +407,7 @@ int iscsi_create_default_params(struct i
 			TYPERANGE_UTF8, USE_INITIAL_ONLY);
 	if (!param)
 		goto out;
+
 	/*
 	 * Extra parameters for ISER from RFC-5046
 	 */

@@ -496,9 +497,9 @@ int iscsi_set_keys_to_negotiate(
 		} else if (!strcmp(param->name, SESSIONTYPE)) {
 			SET_PSTATE_NEGOTIATE(param);
 		} else if (!strcmp(param->name, IFMARKER)) {
-			SET_PSTATE_NEGOTIATE(param);
+			SET_PSTATE_REJECT(param);
 		} else if (!strcmp(param->name, OFMARKER)) {
-			SET_PSTATE_NEGOTIATE(param);
+			SET_PSTATE_REJECT(param);
 		} else if (!strcmp(param->name, IFMARKINT)) {
 			SET_PSTATE_REJECT(param);
 		} else if (!strcmp(param->name, OFMARKINT)) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/iscsi-target-avoid-ofmarker-ifmarker-negotiation.patch queue-4.2/target-attach-extended_copy-local-i-o-descriptors-to-xcopy_pt_sess.patch queue-4.2/target-iscsi-fix-np_ip-bracket-issue-by-removing-np_ip.patch queue-4.2/iser-target-put-the-reference-on-commands-waiting-for-unsol-data.patch queue-4.2/iser-target-remove-command-with-state-istate_remove.patch queue-4.2/target-fix-pr-registration-aptpl-rcu-conversion-regression.patch