[PATCH 3.13.y-ckt 01/19] [3.13-stable only] ipv6: fix swapped ipv4/ipv6 mtu_reduced callbacks

Kamal Mostafa kamal at canonical.com
Thu Jan 15 22:09:37 UTC 2015


3.13.11-ckt14 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Andy Whitcroft <apw at canonical.com>

Fixes up 4fab907195 ("tcp: fix tcp_release_cb() to dispatch via address
family for mtu_reduced()") backport which has swapped ipv4/ipv6 callbacks
for native IPv6 and mapped IPv4 sockets.

BugLink: http://bugs.launchpad.net/bugs/1404558
Signed-off-by: Andy Whitcroft <apw at canonical.com>
Fixes: e86507f2371b667b74e731e366fff55844e79463
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 net/ipv6/tcp_ipv6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d83045c..d540da2 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1640,7 +1640,7 @@ static const struct inet_connection_sock_af_ops ipv6_specific = {
 	.compat_setsockopt = compat_ipv6_setsockopt,
 	.compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-	.mtu_reduced	   = tcp_v4_mtu_reduced,
+	.mtu_reduced	   = tcp_v6_mtu_reduced,
 };
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -1672,7 +1672,7 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = {
 	.compat_setsockopt = compat_ipv6_setsockopt,
 	.compat_getsockopt = compat_ipv6_getsockopt,
 #endif
-	.mtu_reduced	   = tcp_v6_mtu_reduced,
+	.mtu_reduced	   = tcp_v4_mtu_reduced,
 };
 
 #ifdef CONFIG_TCP_MD5SIG
-- 
1.9.1





More information about the kernel-team mailing list