This is a note to let you know that I've just added the patch titled Fix broken backport for IPv6 tunnels
to the 2.6.32-longterm tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary The filename of the patch is: fix-broken-backport-for-ipv6-tunnels.patch and it can be found in the queue-2.6.32 subdirectory. If you, or anyone else, feels it should not be added to the 2.6.32 longterm tree, please let <sta...@kernel.org> know about it. >From pso...@gentoo.org Tue Aug 30 14:52:07 2011 From: Stratos Psomadakis <pso...@gentoo.org> Date: Tue, 30 Aug 2011 17:48:08 +0300 Subject: Fix broken backport for IPv6 tunnels To: sta...@kernel.org Cc: Stratos Psomadakis <pso...@gentoo.org> Message-ID: <1314715688-26919-1-git-send-email-pso...@gentoo.org> From: Stratos Psomadakis <pso...@gentoo.org> Fix broken backport for IPv6 tunnels in 2.6.32-longterm kernels. upstream commit d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978 ("tunnels: fix netns vs proto registration ordering") , which was included in 2.6.32.44-longterm, was not backported correctly, and results in a NULL pointer dereference in ip6_tunnel.c for longterm kernels >=2.6.32.44 Use [un]register_pernet_gen_device() instead of [un]register_pernet_device() to fix it. Signed-off-by: Stratos Psomadakis <pso...@gentoo.org> Cc: Wolfgang Walter <wolfgang.wal...@stwm.de> Cc: Tim Gardner <tim.gard...@canonical.com> Cc: Andy Whitcroft <a...@canonical.com> Signed-off-by: Greg Kroah-Hartman <gre...@suse.de> --- net/ipv6/ip6_tunnel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void) { int err; - err = register_pernet_device(&ip6_tnl_net_ops); + err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops); if (err < 0) goto out_pernet; @@ -1487,7 +1487,7 @@ static int __init ip6_tunnel_init(void) out_ip6ip6: xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET); out_ip4ip6: - unregister_pernet_device(&ip6_tnl_net_ops); + unregister_pernet_gen_device(ip6_tnl_net_id, &ip6_tnl_net_ops); out_pernet: return err; } Patches currently in longterm-queue-2.6.32 which might be from pso...@gentoo.org are /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/fix-broken-backport-for-ipv6-tunnels.patch _______________________________________________ stable mailing list stable@linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable