diff options
| author | Julian Anastasov <ja@ssi.bg> | 2014-07-10 09:24:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:54:14 -0700 |
| commit | a5114ef14123a6da5a62d389ed3dacbfc3a94541 (patch) | |
| tree | 08bca561c3df6667313d5e932e538b425092cd92 /net | |
| parent | a8f165f517656c5c84dcb059ea2d51fa73f2571c (diff) | |
| download | linux-3.10-a5114ef14123a6da5a62d389ed3dacbfc3a94541.tar.gz linux-3.10-a5114ef14123a6da5a62d389ed3dacbfc3a94541.tar.bz2 linux-3.10-a5114ef14123a6da5a62d389ed3dacbfc3a94541.zip | |
ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack
commit 2627b7e15c5064ddd5e578e4efd948d48d531a3f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index a083bda322b..90e756cf6e5 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. |