Attachment 143160 Details for Bug 212839 – proposed additional patch

[patch] proposed additional patch

netfilter_unload_race (text/plain), 2.95 KB, created by Thomas Graf on 2006-12-08 16:09:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Graf

Created: 2006-12-08 16:09:56 UTC

Size: 2.95 KB

patch

obsolete

>Index: linux-2.6.18.i386/net/ipv4/netfilter/ip_conntrack_core.c
>===================================================================
>--- linux-2.6.18.i386.orig/net/ipv4/netfilter/ip_conntrack_core.c	2006-10-30 15:46:10.000000000 +0100
>+++ linux-2.6.18.i386/net/ipv4/netfilter/ip_conntrack_core.c	2006-12-08 16:05:40.000000000 +0100
>@@ -640,11 +640,15 @@
> 		ip_conntrack_hash_rnd_initted = 1;
> 	}
> 
>+	/* We don't want any race condition at early drop stage */
>+	atomic_inc(&ip_conntrack_count);
>+
> 	if (ip_conntrack_max
>-	    && atomic_read(&ip_conntrack_count) >= ip_conntrack_max) {
>+	    && atomic_read(&ip_conntrack_count) > ip_conntrack_max) {
> 		unsigned int hash = hash_conntrack(orig);
> 		/* Try dropping from this hash chain. */
> 		if (!early_drop(&ip_conntrack_hash[hash])) {
>+			atomic_dec(&ip_conntrack_count);
> 			if (net_ratelimit())
> 				printk(KERN_WARNING
> 				       "ip_conntrack: table full, dropping"
>@@ -656,6 +660,7 @@
> 	conntrack = kmem_cache_alloc(ip_conntrack_cachep, GFP_ATOMIC);
> 	if (!conntrack) {
> 		DEBUGP("Can't allocate conntrack.\n");
>+		atomic_dec(&ip_conntrack_count);
> 		return ERR_PTR(-ENOMEM);
> 	}
> 
>@@ -669,8 +674,6 @@
> 	conntrack->timeout.data = (unsigned long)conntrack;
> 	conntrack->timeout.function = death_by_timeout;
> 
>-	atomic_inc(&ip_conntrack_count);
>-
> 	return conntrack;
> }
> 
>Index: linux-2.6.18.i386/net/netfilter/nf_conntrack_core.c
>===================================================================
>--- linux-2.6.18.i386.orig/net/netfilter/nf_conntrack_core.c	2006-10-30 15:46:10.000000000 +0100
>+++ linux-2.6.18.i386/net/netfilter/nf_conntrack_core.c	2006-12-08 16:05:40.000000000 +0100
>@@ -866,11 +866,15 @@
> 		nf_conntrack_hash_rnd_initted = 1;
> 	}
> 
>+	/* We don't want any race condition at early drop stage */
>+	atomic_inc(&nf_conntrack_count);
>+
> 	if (nf_conntrack_max
>-	    && atomic_read(&nf_conntrack_count) >= nf_conntrack_max) {
>+	    && atomic_read(&nf_conntrack_count) > nf_conntrack_max) {
> 		unsigned int hash = hash_conntrack(orig);
> 		/* Try dropping from this hash chain. */
> 		if (!early_drop(&nf_conntrack_hash[hash])) {
>+			atomic_dec(&nf_conntrack_count);
> 			if (net_ratelimit())
> 				printk(KERN_WARNING
> 				       "nf_conntrack: table full, dropping"
>@@ -921,10 +925,12 @@
> 	init_timer(&conntrack->timeout);
> 	conntrack->timeout.data = (unsigned long)conntrack;
> 	conntrack->timeout.function = death_by_timeout;
>+	read_unlock_bh(&nf_ct_cache_lock);
> 
>-	atomic_inc(&nf_conntrack_count);
>+	return conntrack;
> out:
> 	read_unlock_bh(&nf_ct_cache_lock);
>+	atomic_dec(&nf_conntrack_count);
> 	return conntrack;
> }
> 
>Index: linux-2.6.18.i386/net/netfilter/x_tables.c
>===================================================================
>--- linux-2.6.18.i386.orig/net/netfilter/x_tables.c	2006-12-08 16:09:04.000000000 +0100
>+++ linux-2.6.18.i386/net/netfilter/x_tables.c	2006-12-08 16:12:07.000000000 +0100
>@@ -774,6 +774,8 @@
> {
> 	int i;
> 
>+	need_conntrack();
>+
> 	xt = kmalloc(sizeof(struct xt_af) * NPROTO, GFP_KERNEL);
> 	if (!xt)
> 		return -ENOMEM;

Actions: View | Diff

Attachments on bug 212839: 143074 | 143160 | 144042 | 144747 | 144749 | 144824 | 145475 | 145476 | 145477 | 145509 | 145810 | 145811