target/iscsi: Fix np_ip bracket issue by removing np_ip

Revert commit 1997e6259, which causes double brackets on ipv6
inaddr_any addresses.

Since we have np_sockaddr, if we need a textual representation we can
use "%pISc".

Change iscsit_add_network_portal() and iscsit_add_np() signatures to remove
*ip_str parameter.

Fix and extend some comments earlier in the function.

Tested to work for :: and ::1 via iscsiadm, previously :: failed, see
https://bugzilla.redhat.com/show_bug.cgi?id=1249107 .

CC: stable@vger.kernel.org
Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index e55f49c7c847..d75eeb5ce13a 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -341,7 +341,6 @@ static struct iscsi_np *iscsit_get_np(
 
 struct iscsi_np *iscsit_add_np(
         struct __kernel_sockaddr_storage *sockaddr,
-        char *ip_str,
         int network_transport)
 {
         struct sockaddr_in *sock_in;
@@ -370,11 +369,9 @@ struct iscsi_np *iscsit_add_np(
         np->np_flags |= NPF_IP_NETWORK;
         if (sockaddr->ss_family == AF_INET6) {
                 sock_in6 = (struct sockaddr_in6 *)sockaddr;
-                snprintf(np->np_ip, IPV6_ADDRESS_SPACE, "%s", ip_str);
                 np->np_port = ntohs(sock_in6->sin6_port);
         } else {
                 sock_in = (struct sockaddr_in *)sockaddr;
-                sprintf(np->np_ip, "%s", ip_str);
                 np->np_port = ntohs(sock_in->sin_port);
         }
 
@@ -411,8 +408,8 @@ struct iscsi_np *iscsit_add_np(
         list_add_tail(&np->np_list, &g_np_list);
         mutex_unlock(&np_lock);
 
-        pr_debug("CORE[0] - Added Network Portal: %s:%hu on %s\n",
-                np->np_ip, np->np_port, np->np_transport->name);
+        pr_debug("CORE[0] - Added Network Portal: %pISc:%hu on %s\n",
+                &np->np_sockaddr, np->np_port, np->np_transport->name);
 
         return np;
 }
@@ -481,8 +478,8 @@ int iscsit_del_np(struct iscsi_np *np)
         list_del(&np->np_list);
         mutex_unlock(&np_lock);
 
-        pr_debug("CORE[0] - Removed Network Portal: %s:%hu on %s\n",
-                np->np_ip, np->np_port, np->np_transport->name);
+        pr_debug("CORE[0] - Removed Network Portal: %pISc:%hu on %s\n",
+                &np->np_sockaddr, np->np_port, np->np_transport->name);
 
         iscsit_put_transport(np->np_transport);
         kfree(np);
@@ -3463,7 +3460,6 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
                                                 tpg_np_list) {
                                 struct iscsi_np *np = tpg_np->tpg_np;
                                 bool inaddr_any = iscsit_check_inaddr_any(np);
-                                char *fmt_str;
 
                                 if (np->np_network_transport != network_transport)
                                         continue;
@@ -3491,15 +3487,18 @@ iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
                                         }
                                 }
 
-                                if (np->np_sockaddr.ss_family == AF_INET6)
-                                        fmt_str = "TargetAddress=[%s]:%hu,%hu";
-                                else
-                                        fmt_str = "TargetAddress=%s:%hu,%hu";
-
-                                len = sprintf(buf, fmt_str,
-                                        inaddr_any ? conn->local_ip : np->np_ip,
-                                        np->np_port,
-                                        tpg->tpgt);
+                                if (inaddr_any) {
+                                        len = sprintf(buf, "TargetAddress="
+                                                      "%s:%hu,%hu",
+                                                      conn->local_ip,
+                                                      np->np_port,
+                                                      tpg->tpgt);
+                                } else {
+                                        len = sprintf(buf, "TargetAddress="
+                                                      "%pISpc,%hu",
+                                                      &np->np_sockaddr,
+                                                      tpg->tpgt);
+                                }
                                 len += 1;
 
                                 if ((len + payload_len) > buffer_len) {