Commit eca42aaf authored Nov 16, 2013 by Vlad Yasevich Committed by David S. Miller Nov 18, 2013

ipv6: Fix inet6_init() cleanup order



Commit 6d0bfe22
	net: ipv6: Add IPv6 support to the ping socket

introduced a change in the cleanup logic of inet6_init and
has a bug in that ipv6_packet_cleanup() may not be called.
Fix the cleanup ordering.

CC: Hannes Frederic Sowa <hannes@stressinduktion.org>
CC: Lorenzo Colitti <lorenzo@google.com>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Vlad Yasevich <vyasevich@gmail.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 029b234f

net/ipv6/af_inet6.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -958,10 +958,10 @@ static int __init inet6_init(void)

		#ifdef CONFIG_SYSCTL
		sysctl_fail:
		ipv6_packet_cleanup();
		pingv6_exit();
		#endif
		pingv6_fail:
		pingv6_exit();
		ipv6_packet_cleanup();
		ipv6_packet_fail:
		tcpv6_exit();
		tcpv6_fail: