[GIT PULL nf] Second Round of IPVS Fixes for v3.16

[GIT PULL nf] Second Round of IPVS Fixes for v3.16

[Simon Horman]

Hi Pablo,

Please consider this IPVS fix for v3.16.

It resolves a problem that was introduced in v3.0.

I would like this fix considered for -stable and I have checked that it
applies cleanly on top of v3.15.5, v3.14.12, v3.12.24, v3.10.48,
v3.4.98 and v3.2.61.


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:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git tags/ipvs-fixes2-for-v3.16

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)

----------------------------------------------------------------
Fix for crash due to spurious call to ip_vs_conn_drop_conntrack()

This resolves a big introduced in v3.0 by
8f4e0a18682d91 ("IPVS netns exit causes crash in conntrack")

----------------------------------------------------------------
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(-)

[PATCH] ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack

[Simon Horman]

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.
-- 
2.0.0

Re: [GIT PULL nf] Second Round of IPVS Fixes for v3.16

[Pablo Neira Ayuso]

On Wed, Jul 16, 2014 at 09:56:07AM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> Please consider this IPVS fix for v3.16.
> 
> It resolves a problem that was introduced in v3.0.
> 
> I would like this fix considered for -stable and I have checked that it
> applies cleanly on top of v3.15.5, v3.14.12, v3.12.24, v3.10.48,
> v3.4.98 and v3.2.61.

Pulled and enqueue to -stable, thanks.