3.10-stable patches

added patches:
	iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch

diff --git a/queue-3.10/iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch b/queue-3.10/iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch
new file mode 100644 (file)
index 0000000..71ab0ab
--- /dev/null
+++ b/queue-3.10/iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch
@@ -0,0 +1,39 @@
+From roland@kernel.org  Mon Jun 30 09:30:33 2014
+From: Roland Dreier <roland@kernel.org>
+Subject: iscsi-target: Re-add chunk from backport of upstream 79d59d08082d to 3.10
+Date: Mon, 30 Jun 2014 07:02:20 -0700
+To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: target-devel@vger.kernel.org, stable@vger.kernel.org
+Message-ID: <1404136940-16049-1-git-send-email-roland@kernel.org>
+
+
+From: Roland Dreier <roland@purestorage.com>
+
+Commit d5c55fa31a29, the backport of upstream 79d59d08082d
+("iscsi-target: Fix wrong buffer / buffer overrun in
+iscsi_change_param_value()") left out applying one chunk of the fix in
+iscsi_login_non_zero_tsih_s2().  Add the missing chunk.
+
+Signed-off-by: Roland Dreier <roland@purestorage.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/target/iscsi/iscsi_target_login.c |    7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/drivers/target/iscsi/iscsi_target_login.c
++++ b/drivers/target/iscsi/iscsi_target_login.c
+@@ -597,13 +597,8 @@ static int iscsi_login_non_zero_tsih_s2(
+        *
+        * In our case, we have already located the struct iscsi_tiqn at this point.
+        */
+-      memset(buf, 0, 32);
+-      sprintf(buf, "TargetPortalGroupTag=%hu", ISCSI_TPG_S(sess)->tpgt);
+-      if (iscsi_change_param_value(buf, conn->param_list, 0) < 0) {
+-              iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+-                              ISCSI_LOGIN_STATUS_NO_RESOURCES);
++      if (iscsi_change_param_sprintf(conn, "TargetPortalGroupTag=%hu", sess->tpg->tpgt))
+               return -1;
+-      }
+ 
+       return iscsi_login_disable_FIM_keys(conn->param_list, conn);
+ }

diff --git a/queue-3.10/series b/queue-3.10/series
index 3d529ba9a2db321cdf4bb26837f8fb885a8ba06c..58f1b231954d326a24617e76ea6ce221102ffe56 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -75,3 +75,4 @@ usb-usbtest-add-timetout-to-simple_io.patch
 target-iser-improve-cm-events-handling.patch
 target-iser-wait-for-proper-cleanup-before-unloading.patch
 x86_32-entry-do-syscall-exit-work-on-badsys-cve-2014-4508.patch
+iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch