Commit 3eee8407 authored by Roland Dreier's avatar Roland Dreier Committed by Greg Kroah-Hartman

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

Commit d5c55fa3, the backport of upstream 79d59d08
("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: default avatarRoland Dreier <roland@purestorage.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 286c9b2c
...@@ -597,13 +597,8 @@ static int iscsi_login_non_zero_tsih_s2( ...@@ -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. * In our case, we have already located the struct iscsi_tiqn at this point.
*/ */
memset(buf, 0, 32); if (iscsi_change_param_sprintf(conn, "TargetPortalGroupTag=%hu", sess->tpg->tpgt))
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);
return -1; return -1;
}
return iscsi_login_disable_FIM_keys(conn->param_list, conn); return iscsi_login_disable_FIM_keys(conn->param_list, conn);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment