---

yaml --- r: 236636 b: refs/heads/master c: 1cc34c3 h: refs/heads/master v: v3
git-mirror · Jan 18, 2011 · b4e122f · b4e122f
1 parent 48b9ee0
commit b4e122f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae9d67aff60af59548b6c7d1a74febea09660122
+refs/heads/master: 1cc34c30be0e27d4ba8c1ce04a8a4f46c927d121
diff --git a/trunk/net/netfilter/xt_connlimit.c b/trunk/net/netfilter/xt_connlimit.c
@@ -204,11 +204,9 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
 	                         &info->mask, par->family);
 	spin_unlock_bh(&info->data->lock);
 
-	if (connections < 0) {
+	if (connections < 0)
 		/* kmalloc failed, drop it entirely */
-		par->hotdrop = true;
-		return false;
-	}
+		goto hotdrop;
 
 	return (connections > info->limit) ^ info->inverse;