* [PATCH net] IPVS fix pull request
@ 2014-07-21 12:15 Pablo Neira Ayuso
2014-07-21 12:15 ` [PATCH net] ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-21 12:15 UTC (permalink / raw)
To: netfilter-devel; +Cc: davem, netdev
Hi David,
Via Simon Horman, I received the following one-liner for your net tree:
1) Fix crash when exiting from netns that uses IPVS and conntrack,
from Julian Anastasov via Simon Horman.
You can pull this change from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit ce355e209feb030945dae4c358c02f29a84f3f8b:
netfilter: nf_tables: 64bit stats need some extra synchronization (2014-07-14 12:00:17 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
for you to fetch changes up to 2627b7e15c5064ddd5e578e4efd948d48d531a3f:
ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack (2014-07-16 09:39:28 +0900)
----------------------------------------------------------------
Julian Anastasov (1):
ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack
net/netfilter/ipvs/ip_vs_conn.c | 1 -
1 file changed, 1 deletion(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH net] ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack
2014-07-21 12:15 [PATCH net] IPVS fix pull request Pablo Neira Ayuso
@ 2014-07-21 12:15 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-21 12:15 UTC (permalink / raw)
To: netfilter-devel; +Cc: davem, netdev
From: Julian Anastasov <ja@ssi.bg>
commit 8f4e0a18682d91 ("IPVS netns exit causes crash in conntrack")
added second ip_vs_conn_drop_conntrack call instead of just adding
the needed check. As result, the first call still can cause
crash on netns exit. Remove it.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_conn.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index a8eb0a8..610e19c 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -797,7 +797,6 @@ static void ip_vs_conn_expire(unsigned long data)
ip_vs_control_del(cp);
if (cp->flags & IP_VS_CONN_F_NFCT) {
- ip_vs_conn_drop_conntrack(cp);
/* Do not access conntracks during subsys cleanup
* because nf_conntrack_find_get can not be used after
* conntrack cleanup for the net.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-21 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-21 12:15 [PATCH net] IPVS fix pull request Pablo Neira Ayuso
2014-07-21 12:15 ` [PATCH net] ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).