sctp: support ipv6 nonlocal bind

[linux-2.6-block.git] / net / sctp / ipv6.c

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index ae6f1a2178bab81fa14562bd1c37d1e55557b1e3..660c4a4cac31717a93dc274227eab2e7ae42ff30 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -560,6 +560,7 @@ static int sctp_v6_is_any(const union sctp_addr *addr)
 static int sctp_v6_available(union sctp_addr *addr, struct sctp_sock *sp)
 {
        int type;
+       struct net *net = sock_net(&sp->inet.sk);
        const struct in6_addr *in6 = (const struct in6_addr *)&addr->v6.sin6_addr;
 
        type = ipv6_addr_type(in6);
@@ -574,7 +575,8 @@ static int sctp_v6_available(union sctp_addr *addr, struct sctp_sock *sp)
        if (!(type & IPV6_ADDR_UNICAST))
                return 0;
 
-       return ipv6_chk_addr(sock_net(&sp->inet.sk), in6, NULL, 0);
+       return sp->inet.freebind || net->ipv6.sysctl.ip_nonlocal_bind ||
+               ipv6_chk_addr(net, in6, NULL, 0);
 }
 
 /* This function checks if the address is a valid address to be used for