Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "Things have been quiet this round with mostly bugfixes, percpu
  conversions, and other minor iscsi-target conformance testing changes.

  The highlights include:

   - Add demo_mode_discovery attribute for iscsi-target (Thomas)
   - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
   - Add send completion interrupt coalescing for ib_isert
   - Convert target-core to use percpu-refcounting for se_lun
   - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
   - tcm_loop updates (Hannes)
   - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)

  v3.14 is currently shaping to be a busy development cycle in target
  land, with initial support for T10 Referrals and T10 DIF currently on
  the roadmap"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
  iscsi-target: chap auth shouldn't match username with trailing garbage
  iscsi-target: fix extract_param to handle buffer length corner case
  iscsi-target: Expose default_erl as TPG attribute
  target_core_configfs: split up ALUA supported states
  target_core_alua: Make supported states configurable
  target_core_alua: Store supported ALUA states
  target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
  target_core_alua: spellcheck
  target core: rename (ex,im)plict -> (ex,im)plicit
  percpu-refcount: Add percpu-refcount.o to obj-y
  iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
  iscsi-target: Convert iscsi_session statistics to atomic_long_t
  target: Convert se_device statistics to atomic_long_t
  target: Fix delayed Task Aborted Status (TAS) handling bug
  iscsi-target: Reject unsupported multi PDU text command sequence
  ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
  iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
  target: Core does not need blkdev.h
  target: Pass through I/O topology for block backstores
  iser-target: Avoid using FRMR for single dma entry requests
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index ef6d836a4d09..83c965c65386 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -88,7 +88,7 @@ int extract_param(
         if (len < 0)
                 return -1;
 
-        if (len > max_length) {
+        if (len >= max_length) {
                 pr_err("Length of input: %d exceeds max_length:"
                         " %d\n", len, max_length);
                 return -1;
@@ -140,7 +140,7 @@ static u32 iscsi_handle_authentication(
                         iscsi_nacl = container_of(se_nacl, struct iscsi_node_acl,
                                                   se_node_acl);
 
-                        auth = ISCSI_NODE_AUTH(iscsi_nacl);
+                        auth = &iscsi_nacl->node_auth;
                 }
         } else {
                 /*
@@ -789,7 +789,7 @@ static int iscsi_target_handle_csg_zero(
                 return -1;
 
         if (!iscsi_check_negotiated_keys(conn->param_list)) {
-                if (ISCSI_TPG_ATTRIB(ISCSI_TPG_C(conn))->authentication &&
+                if (conn->tpg->tpg_attrib.authentication &&
                     !strncmp(param->value, NONE, 4)) {
                         pr_err("Initiator sent AuthMethod=None but"
                                 " Target is enforcing iSCSI Authentication,"
@@ -799,7 +799,7 @@ static int iscsi_target_handle_csg_zero(
                         return -1;
                 }
 
-                if (ISCSI_TPG_ATTRIB(ISCSI_TPG_C(conn))->authentication &&
+                if (conn->tpg->tpg_attrib.authentication &&
                     !login->auth_complete)
                         return 0;
 
@@ -862,7 +862,7 @@ static int iscsi_target_handle_csg_one(struct iscsi_conn *conn, struct iscsi_log
         }
 
         if (!login->auth_complete &&
-             ISCSI_TPG_ATTRIB(ISCSI_TPG_C(conn))->authentication) {
+             conn->tpg->tpg_attrib.authentication) {
                 pr_err("Initiator is requesting CSG: 1, has not been"
                          " successfully authenticated, and the Target is"
                         " enforcing iSCSI Authentication, login failed.\n");