[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20131206214643.313825871@linuxfoundation.org>
Date: Fri, 6 Dec 2013 13:51:25 -0800
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org,
Hannes Frederic Sowa <hannes@...essinduktion.org>,
Lorenzo Colitti <lorenzo@...gle.com>,
Fabio Estevam <fabio.estevam@...escale.com>,
Vlad Yasevich <vyasevich@...il.com>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH 3.12 35/83] ipv6: Fix inet6_init() cleanup order
3.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Yasevich <vyasevich@...il.com>
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>
Acked-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
net/ipv6/af_inet6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -965,10 +965,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:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists