19 files changed, 554 insertions, 226 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 339f97f7085b..23a98e658306 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -264,16 +264,50 @@ int iscsit_deaccess_np(struct iscsi_np *np, struct iscsi_portal_group *tpg)
         return 0;
 }
 
-static struct iscsi_np *iscsit_get_np(
+bool iscsit_check_np_match(
         struct __kernel_sockaddr_storage *sockaddr,
+        struct iscsi_np *np,
         int network_transport)
 {
         struct sockaddr_in *sock_in, *sock_in_e;
         struct sockaddr_in6 *sock_in6, *sock_in6_e;
-        struct iscsi_np *np;
-        int ip_match = 0;
+        bool ip_match = false;
         u16 port;
 
+        if (sockaddr->ss_family == AF_INET6) {
+                sock_in6 = (struct sockaddr_in6 *)sockaddr;
+                sock_in6_e = (struct sockaddr_in6 *)&np->np_sockaddr;
+
+                if (!memcmp(&sock_in6->sin6_addr.in6_u,
+                            &sock_in6_e->sin6_addr.in6_u,
+                            sizeof(struct in6_addr)))
+                        ip_match = true;
+
+                port = ntohs(sock_in6->sin6_port);
+        } else {
+                sock_in = (struct sockaddr_in *)sockaddr;
+                sock_in_e = (struct sockaddr_in *)&np->np_sockaddr;
+
+                if (sock_in->sin_addr.s_addr == sock_in_e->sin_addr.s_addr)
+                        ip_match = true;
+
+                port = ntohs(sock_in->sin_port);
+        }
+
+        if ((ip_match == true) && (np->np_port == port) &&
+            (np->np_network_transport == network_transport))
+                return true;
+
+        return false;
+}
+
+static struct iscsi_np *iscsit_get_np(
+        struct __kernel_sockaddr_storage *sockaddr,
+        int network_transport)
+{
+        struct iscsi_np *np;
+        bool match;
+
         spin_lock_bh(&np_lock);
         list_for_each_entry(np, &g_np_list, np_list) {
                 spin_lock(&np->np_thread_lock);
@@ -282,29 +316,8 @@ static struct iscsi_np *iscsit_get_np(
                         continue;
                 }
 
-                if (sockaddr->ss_family == AF_INET6) {
-                        sock_in6 = (struct sockaddr_in6 *)sockaddr;
-                        sock_in6_e = (struct sockaddr_in6 *)&np->np_sockaddr;
-
-                        if (!memcmp(&sock_in6->sin6_addr.in6_u,
-                                    &sock_in6_e->sin6_addr.in6_u,
-                                    sizeof(struct in6_addr)))
-                                ip_match = 1;
-
-                        port = ntohs(sock_in6->sin6_port);
-                } else {
-                        sock_in = (struct sockaddr_in *)sockaddr;
-                        sock_in_e = (struct sockaddr_in *)&np->np_sockaddr;
-
-                        if (sock_in->sin_addr.s_addr ==
-                            sock_in_e->sin_addr.s_addr)
-                                ip_match = 1;
-
-                        port = ntohs(sock_in->sin_port);
-                }
-
-                if ((ip_match == 1) && (np->np_port == port) &&
-                    (np->np_network_transport == network_transport)) {
+                match = iscsit_check_np_match(sockaddr, np, network_transport);
+                if (match == true) {
                         /*
                          * Increment the np_exports reference count now to
                          * prevent iscsit_del_np() below from being called
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h
index f1e4f3155bac..b1a1e6350707 100644
--- a/drivers/target/iscsi/iscsi_target.h
+++ b/drivers/target/iscsi/iscsi_target.h
@@ -8,6 +8,8 @@ extern struct iscsi_tiqn *iscsit_add_tiqn(unsigned char *);
 extern void iscsit_del_tiqn(struct iscsi_tiqn *);
 extern int iscsit_access_np(struct iscsi_np *, struct iscsi_portal_group *);
 extern int iscsit_deaccess_np(struct iscsi_np *, struct iscsi_portal_group *);
+extern bool iscsit_check_np_match(struct __kernel_sockaddr_storage *,
+                                struct iscsi_np *, int);
 extern struct iscsi_np *iscsit_add_np(struct __kernel_sockaddr_storage *,
                                 char *, int);
 extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index d89164287d00..ca2be406f141 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -1095,11 +1095,11 @@ static int iscsi_check_acceptor_state(struct iscsi_param *param, char *value,
                                 SET_PSTATE_REPLY_OPTIONAL(param);
                 }
         } else if (IS_TYPE_NUMBER(param)) {
-                char *tmpptr, buf[10];
+                char *tmpptr, buf[11];
                 u32 acceptor_value = simple_strtoul(param->value, &tmpptr, 0);
                 u32 proposer_value = simple_strtoul(value, &tmpptr, 0);
 
-                memset(buf, 0, 10);
+                memset(buf, 0, sizeof(buf));
 
                 if (!strcmp(param->name, MAXCONNECTIONS) ||
                     !strcmp(param->name, MAXBURSTLENGTH) ||
@@ -1503,8 +1503,8 @@ static int iscsi_enforce_integrity_rules(
                         FirstBurstLength = simple_strtoul(param->value,
                                         &tmpptr, 0);
                         if (FirstBurstLength > MaxBurstLength) {
-                                char tmpbuf[10];
-                                memset(tmpbuf, 0, 10);
+                                char tmpbuf[11];
+                                memset(tmpbuf, 0, sizeof(tmpbuf));
                                 sprintf(tmpbuf, "%u", MaxBurstLength);
                                 if (iscsi_update_param_value(param, tmpbuf))
                                         return -1;
diff --git a/drivers/target/iscsi/iscsi_target_stat.c b/drivers/target/iscsi/iscsi_target_stat.c
index 421d6947dc64..464b4206a51e 100644
--- a/drivers/target/iscsi/iscsi_target_stat.c
+++ b/drivers/target/iscsi/iscsi_target_stat.c
@@ -410,14 +410,16 @@ static ssize_t iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type(
         struct iscsi_tiqn *tiqn = container_of(igrps,
                         struct iscsi_tiqn, tiqn_stat_grps);
         struct iscsi_login_stats *lstat = &tiqn->login_stats;
-        unsigned char buf[8];
+        int ret;