Attachment 176401 Details for Bug 212922 – new patch

new patch

linux-2.6.9-iptables-sockopt-deadlock.patch (text/x-patch), 1.62 KB, created by Neil Horman on 2007-08-28 13:22:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-08-28 13:22:23 UTC

Size: 1.62 KB

patch

obsolete

>--- linux-2.6.9/net/core/netfilter.c.orig	2004-10-18 17:54:07.000000000 -0400
>+++ linux-2.6.9/net/core/netfilter.c	2007-08-28 08:35:41.000000000 -0400
>@@ -48,6 +48,7 @@
> struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];
> static LIST_HEAD(nf_sockopts);
> static spinlock_t nf_hook_lock = SPIN_LOCK_UNLOCKED;
>+static DECLARE_RWSEM(nf_use_lock);
> 
> /* 
>  * A queue handler may be registered for each protocol.  Each is protected by
>@@ -126,11 +127,14 @@
> void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
> {
> 	/* No point being interruptible: we're probably in cleanup_module() */
>+	down_write(&nf_use_lock);
>  restart:
> 	down(&nf_sockopt_mutex);
> 	if (reg->use != 0) {
> 		/* To be woken by nf_sockopt call... */
> 		/* FIXME: Stuart Young's name appears gratuitously. */
>+		printk(KERN_CRIT "NETFILTER USE NONZERO ON UNREGISTER\n");
>+		BUG();
> 		set_current_state(TASK_UNINTERRUPTIBLE);
> 		reg->cleanup_task = current;
> 		up(&nf_sockopt_mutex);
>@@ -139,6 +143,7 @@
> 	}
> 	list_del(&reg->list);
> 	up(&nf_sockopt_mutex);
>+	up_write(&nf_use_lock);
> }
> 
> #ifdef CONFIG_NETFILTER_DEBUG
>@@ -292,8 +297,12 @@
> 	struct nf_sockopt_ops *ops;
> 	int ret;
> 
>-	if (down_interruptible(&nf_sockopt_mutex) != 0)
>+	down_read(&nf_use_lock);
>+
>+	if (down_interruptible(&nf_sockopt_mutex) != 0) {
>+		up_read(&nf_use_lock);
> 		return -EINTR;
>+	}
> 
> 	list_for_each(i, &nf_sockopts) {
> 		ops = (struct nf_sockopt_ops *)i;
>@@ -318,6 +327,7 @@
> 		}
> 	}
> 	up(&nf_sockopt_mutex);
>+	up_read(&nf_use_lock);
> 	return -ENOPROTOOPT;
> 	
>  out:
>@@ -326,6 +336,7 @@
> 	if (ops->cleanup_task)
> 		wake_up_process(ops->cleanup_task);
> 	up(&nf_sockopt_mutex);
>+	up_read(&nf_use_lock);
> 	return ret;
> }
>

Actions: View

Attachments on bug 212922: 159071 | 159072 | 159567 | 159568 | 159571 | 160770 | 160787 | 169395 | 174041 | 174261 | 176401 | 183901 | 183921 | 184891 | 186411 | 186601