[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1384633044-26453-1-git-send-email-vyasevich@gmail.com>
Date: Sat, 16 Nov 2013 15:17:24 -0500
From: Vlad Yasevich <vyasevich@...il.com>
To: netdev@...r.kernel.org
Cc: Vlad Yasevich <vyasevich@...il.com>,
Hannes Frederic Sowa <hannes@...essinduktion.org>,
Lorenzo Colitti <lorenzo@...gle.com>,
Fabio Estevam <fabio.estevam@...escale.com>
Subject: [PATCHv2] ipv6: Fix inet6_init() cleanup order
Commit 6d0bfe22611602f36617bc7aa2ffa1bbb2f54c67
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@...essinduktion.org>
CC: Lorenzo Colitti <lorenzo@...gle.com>
CC: Fabio Estevam <fabio.estevam@...escale.com>
Signed-off-by: Vlad Yasevich <vyasevich@...il.com>
---
net/ipv6/af_inet6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 6468bda..56ca35b 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -958,10 +958,10 @@ out:
#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:
--
1.8.4.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists