From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40633 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751973AbbJQXxe (ORCPT ); Sat, 17 Oct 2015 19:53:34 -0400 Subject: Patch "iscsi-target: Avoid OFMarker + IFMarker negotiation" has been added to the 4.2-stable tree To: nab@linux-iscsi.org, agrover@redhat.com, cvubrugier@fastmail.fm, galileo@pkm-inc.com, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 17 Oct 2015 16:53:33 -0700 Message-ID: <1445126013227119@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 673681cafa99776e334c3e61cafa2cf115950c32 Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger 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 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. Reported-by: Dragan Milivojević Bisected-by: Christophe Vu-Brugier Tested-by: Christophe Vu-Brugier Signed-off-by: Nicholas Bellinger Cc: Andy Grover Signed-off-by: Greg Kroah-Hartman --- drivers/target/iscsi/iscsi_target_parameters.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -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 nab@linux-iscsi.org 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