[3.13.y-ckt stable] Patch "[3.13-stable only] ipv6: fix swapped ipv4/ipv6 mtu_reduced callbacks" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Tue Jan 13 21:27:11 UTC 2015


This is a note to let you know that I have just added a patch titled

    [3.13-stable only] ipv6: fix swapped ipv4/ipv6 mtu_reduced callbacks

to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11-ckt14.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 409de51a8aa51d7a1009698c8bbbb6e6223953ef Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw at canonical.com>
Date: Fri, 9 Jan 2015 18:35:25 +0000
Subject: [3.13-stable only] ipv6: fix swapped ipv4/ipv6 mtu_reduced callbacks

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