[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-stable-commits
Subject:    Patch "iscsi-target: Re-add chunk from backport of upstream 79d59d08082d to 3.10" has been added to 
From:       <gregkh () linuxfoundation ! org>
Date:       2014-06-30 16:31:29
Message-ID: 14041458891349 () kroah ! com
[Download RAW message or body]


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

    iscsi-target: Re-add chunk from backport of upstream 79d59d08082d to 3.10

to the 3.10-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-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


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);
 }


Patches currently in stable-queue which might be from roland@kernel.org are

queue-3.10/iscsi-target-re-add-chunk-from-backport-of-upstream-79d59d08082d-to-3.10.patch
--
To unsubscribe from this list: send the line "unsubscribe stable-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]