sctp: try harder to figure out address family when checking wildcards

sctp_is_any() function that is used to check for wildcard addresses
only looks at the address itself to determine the address family.
This function is used in the API to check the address passed in from
the user.  If the user simply zerroes out the sockaddr_storage and
pass that in, we'll end up failing.  So, let's try harder to determine
the address family by also checking the socket if it's possible.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 47f91afa0211..c78da3c9dd34 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -837,6 +837,7 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
                                struct sctp_sock *opt)
 {
         struct sctp_af *af1, *af2;
+        struct sock *sk = sctp_opt2sk(opt);
 
         af1 = sctp_get_af_specific(addr1->sa.sa_family);
         af2 = sctp_get_af_specific(addr2->sa.sa_family);
@@ -845,11 +846,11 @@ static int sctp_inet6_cmp_addr(const union sctp_addr *addr1,
                 return 0;
 
         /* If the socket is IPv6 only, v4 addrs will not match */
-        if (__ipv6_only_sock(sctp_opt2sk(opt)) && af1 != af2)
+        if (__ipv6_only_sock(sk) && af1 != af2)
                 return 0;
 
         /* Today, wildcard AF_INET/AF_INET6. */
-        if (sctp_is_any(addr1) || sctp_is_any(addr2))
+        if (sctp_is_any(sk, addr1) || sctp_is_any(sk, addr2))
                 return 1;
 
         if (addr1->sa.sa_family != addr2->sa.sa_family)