aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2009-03-24 12:24:51 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-24 22:49:11 -0400
commitb2f5e7cd3dee2ed721bf0675e1a1ddebb849aee6 (patch)
treea7b48c260a3cb0050ad6198c6a50b52b318dfcb8 /net/ipv4
parent63d9950b08184e6531adceb65f64b429909cc101 (diff)
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/udp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 05b7abb99f69..ace2ac8a42f7 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -222,7 +222,7 @@ fail:
222 return error; 222 return error;
223} 223}
224 224
225static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) 225int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
226{ 226{
227 struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); 227 struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
228 228
@@ -1819,6 +1819,7 @@ EXPORT_SYMBOL(udp_lib_getsockopt);
1819EXPORT_SYMBOL(udp_lib_setsockopt); 1819EXPORT_SYMBOL(udp_lib_setsockopt);
1820EXPORT_SYMBOL(udp_poll); 1820EXPORT_SYMBOL(udp_poll);
1821EXPORT_SYMBOL(udp_lib_get_port); 1821EXPORT_SYMBOL(udp_lib_get_port);
1822EXPORT_SYMBOL(ipv4_rcv_saddr_equal);
1822 1823
1823#ifdef CONFIG_PROC_FS 1824#ifdef CONFIG_PROC_FS
1824EXPORT_SYMBOL(udp_proc_register); 1825EXPORT_SYMBOL(udp_proc_register);