---

yaml --- r: 298758 b: refs/heads/master c: d96fc65 h: refs/heads/master v: v3
git-mirror · Apr 3, 2012 · ccde7de · ccde7de
1 parent a46fe04
commit ccde7de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee14186f8d2338227888f3c00a06caf31f94de38
+refs/heads/master: d96fc659aeb27686cef42d305cfd0c9702f8841c
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
@@ -735,6 +735,7 @@ __nf_conntrack_alloc(struct net *net, u16 zone,
 
 #ifdef CONFIG_NF_CONNTRACK_ZONES
 out_free:
+	atomic_dec(&net->ct.count);
 	kmem_cache_free(net->ct.nf_conntrack_cachep, ct);
 	return ERR_PTR(-ENOMEM);
 #endif