ipv6: Fix conflict resolutions during ipv6 binding

The ipv6 version of bind_conflict code calls ipv6_rcv_saddr_equal()
which at times wrongly identified intersections between addresses.
It particularly broke down under a few instances and caused erroneous
bind conflicts.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 2 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index c216de528b08..7b55ab215a64 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -88,8 +88,8 @@ extern int			ipv6_dev_get_saddr(struct net *net,
 extern int                      ipv6_get_lladdr(struct net_device *dev,
                                                 struct in6_addr *addr,
                                                 unsigned char banned_flags);
-extern int                      ipv6_rcv_saddr_equal(const struct sock *sk, 
-                                                      const struct sock *sk2);
+extern int                      ipv6_rcv_saddr_equal(const struct sock *sk,
+                                                    const struct sock *sk2);
 extern void                     addrconf_join_solict(struct net_device *dev,
                                         struct in6_addr *addr);
 extern void                     addrconf_leave_solict(struct inet6_dev *idev,
diff --git a/include/net/udp.h b/include/net/udp.h
index 90e6ce56be65..93dbe294d459 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -124,6 +124,8 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
         sk_common_release(sk);
 }
 
+extern int      ipv4_rcv_saddr_equal(const struct sock *sk1,
+                                    const struct sock *sk2);
 extern int      udp_lib_get_port(struct sock *sk, unsigned short snum,
                 int (*)(const struct sock*,const struct sock*));