RDMA/srp: Accept again source addresses that do not have a port number
Subsystems (3)
Bart Van Assche
maintainerPATCH RESEND 1/1 RDMA/srp: Accept again source addresses that do not have a port number
The function srp_parse_in() is used both for parsing source address specifications and for target address specifications. Target addresses must have a port number. Having to specify a port number for source addresses is inconvenient. Make sure that srp_parse_in() supports again parsing addresses with no port number.
--- drivers/infiniband/ulp/srp/ib_srp.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +15 -6
@@ -3481,13 +3481,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;
@@ -3496,9 +3497,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 ;
@@ -3520,6 +3524,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 ;
@@ -3618,7 +3623,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);
@@ -3634,7 +3640,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);
Signature · 1 line
2.22.0.rc1
Quoted 6 lines · Bart Van Assche
The function
srp_parse_in()is used both for parsing source address specifications and for target address specifications. Target addresses must have a port number. Having to specify a port number for source addresses is inconvenient. Make sure thatsrp_parse_in()supports again parsing addresses with no port number.
Quoted 7 lines
Cc Laurence Oberman <[email protected]>Cc <[email protected]>Fixes c62adb7def71 ("IB/srp: Fix IPv6 address parsing") # v4.17.Signed-off-by Bart Van Assche <[email protected]>--- drivers/infiniband/ulp/srp/ib_srp.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
Bart, do you want this applied now, or are we still waiting for Laurence?
Jason
Bart Van Assche
maintainerQuoted 15 lines · Jason Gunthorpe
Quoted 6 lines · Bart Van Assche
The function
srp_parse_in()is used both for parsing source address specifications and for target address specifications. Target addresses must have a port number. Having to specify a port number for source addresses is inconvenient. Make sure thatsrp_parse_in()supports again parsing addresses with no port number.Quoted 7 lines
Cc Laurence Oberman <[email protected]>Cc <[email protected]>Fixes c62adb7def71 ("IB/srp: Fix IPv6 address parsing") # v4.17.Signed-off-by Bart Van Assche <[email protected]>--- drivers/infiniband/ulp/srp/ib_srp.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
Quoted 2 lines
Bart, do you want this applied now, or are we still waiting for Laurence?
Hi Jason,
Since Laurence has not replied to your e-mail please go ahead and apply this patch.
Thanks,
Bart.
Jason Gunthorpe
AppliedQuoted 6 lines · Bart Van Assche
The function
srp_parse_in()is used both for parsing source address specifications and for target address specifications. Target addresses must have a port number. Having to specify a port number for source addresses is inconvenient. Make sure thatsrp_parse_in()supports again parsing addresses with no port number.
Quoted 7 lines
Cc Laurence Oberman <[email protected]>Cc <[email protected]>Fixes c62adb7def71 ("IB/srp: Fix IPv6 address parsing") # v4.17.Signed-off-by Bart Van Assche <[email protected]>--- drivers/infiniband/ulp/srp/ib_srp.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
Applied to for-next, thanks
Jason