diff options
| author | Julian Anastasov <ja@ssi.bg> | 2014-07-10 02:24:01 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2014-07-15 20:39:28 -0400 |
| commit | 2627b7e15c5064ddd5e578e4efd948d48d531a3f (patch) | |
| tree | 44020620c8357f9dfd3b0e1ff2137e8af8a1ab58 /net | |
| parent | ce355e209feb030945dae4c358c02f29a84f3f8b (diff) | |
ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack
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>
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 a8eb0a89326a..610e19c0e13f 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) | |||
| 797 | ip_vs_control_del(cp); | 797 | ip_vs_control_del(cp); |
| 798 | 798 | ||
| 799 | if (cp->flags & IP_VS_CONN_F_NFCT) { | 799 | if (cp->flags & IP_VS_CONN_F_NFCT) { |
| 800 | ip_vs_conn_drop_conntrack(cp); | ||
| 801 | /* Do not access conntracks during subsys cleanup | 800 | /* Do not access conntracks during subsys cleanup |
| 802 | * because nf_conntrack_find_get can not be used after | 801 | * because nf_conntrack_find_get can not be used after |
| 803 | * conntrack cleanup for the net. | 802 | * conntrack cleanup for the net. |