Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / srp / ib_srp.c

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index d5cbad2c61e490a4096669e5a27373089378b9f0..c7bd96edce80ea3a65c1f79cbfcc2b226ccb96fd 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3466,13 +3466,14 @@ static const match_table_t srp_opt_tokens = {
  * @net:          [in]  Network namespace.
  * @sa:                   [out] Address family, IP address and port number.
  * @addr_port_str: [in]  IP address and port number.
+ * @has_port:     [out] Whether or not @addr_port_str includes a port number.
  *
  * Parse the following address formats:
  * - IPv4: <ip_address>:<port>, e.g. 1.2.3.4:5.
  * - IPv6: \[<ipv6_address>\]:<port>, e.g. [1::2:3%4]:5.
  */
 static int srp_parse_in(struct net *net, struct sockaddr_storage *sa,
-                       const char *addr_port_str)
+                       const char *addr_port_str, bool *has_port)
 {
        char *addr_end, *addr = kstrdup(addr_port_str, GFP_KERNEL);
        char *port_str;
@@ -3481,9 +3482,12 @@ static int srp_parse_in(struct net *net, struct sockaddr_storage *sa,
        if (!addr)
                return -ENOMEM;
        port_str = strrchr(addr, ':');
-       if (!port_str)
-               return -EINVAL;
-       *port_str++ = '\0';
+       if (port_str && strchr(port_str, ']'))
+               port_str = NULL;
+       if (port_str)
+               *port_str++ = '\0';
+       if (has_port)
+               *has_port = port_str != NULL;
        ret = inet_pton_with_scope(net, AF_INET, addr, port_str, sa);
        if (ret && addr[0]) {
                addr_end = addr + strlen(addr) - 1;
@@ -3505,6 +3509,7 @@ static int srp_parse_options(struct net *net, const char *buf,
        char *p;
        substring_t args[MAX_OPT_ARGS];
        unsigned long long ull;
+       bool has_port;
        int opt_mask = 0;
        int token;
        int ret = -EINVAL;
@@ -3603,7 +3608,8 @@ static int srp_parse_options(struct net *net, const char *buf,
                                ret = -ENOMEM;
                                goto out;
                        }
-                       ret = srp_parse_in(net, &target->rdma_cm.src.ss, p);
+                       ret = srp_parse_in(net, &target->rdma_cm.src.ss, p,
+                                          NULL);
                        if (ret < 0) {
                                pr_warn("bad source parameter '%s'\n", p);
                                kfree(p);
@@ -3619,7 +3625,10 @@ static int srp_parse_options(struct net *net, const char *buf,
                                ret = -ENOMEM;
                                goto out;
                        }
-                       ret = srp_parse_in(net, &target->rdma_cm.dst.ss, p);
+                       ret = srp_parse_in(net, &target->rdma_cm.dst.ss, p,
+                                          &has_port);
+                       if (!has_port)
+                               ret = -EINVAL;
                        if (ret < 0) {
                                pr_warn("bad dest parameter '%s'\n", p);
                                kfree(p);