Attachment 186411 Details for Bug 212922 – final, working patch

[patch] final, working patch

linux-kernel-test.patch (text/plain), 8.77 KB, created by Neil Horman on 2007-09-04 18:29:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-09-04 18:29:47 UTC

Size: 8.77 KB

patch

obsolete

>diff -up linux-2.6.9/include/linux/netfilter.h.orig linux-2.6.9/include/linux/netfilter.h
>--- linux-2.6.9/include/linux/netfilter.h.orig	2007-09-04 10:31:15.000000000 -0400
>+++ linux-2.6.9/include/linux/netfilter.h	2007-09-04 10:35:51.000000000 -0400
>@@ -96,6 +96,7 @@ void nf_unregister_hook(struct nf_hook_o
> /* Functions to register get/setsockopt ranges (non-inclusive).  You
>    need to check permissions yourself! */
> int nf_register_sockopt(struct nf_sockopt_ops *reg);
>+int nf_register_sockopt_owner(struct nf_sockopt_ops *reg, struct module *owner);
> void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
> 
> extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];
>diff -up linux-2.6.9/kernel/module.c.orig linux-2.6.9/kernel/module.c
>--- linux-2.6.9/kernel/module.c.orig	2007-09-04 10:51:10.000000000 -0400
>+++ linux-2.6.9/kernel/module.c	2007-09-04 10:51:22.000000000 -0400
>@@ -592,6 +592,8 @@ sys_delete_module(const char __user *nam
> 
> 	/* Stop the machine so refcounts can't move and disable module. */
> 	ret = try_stop_module(mod, flags, &forced);
>+	if (ret != 0)
>+		goto out;
> 
> 	/* Never wait if forced. */
> 	if (!forced && module_refcount(mod) != 0)
>diff -up linux-2.6.9/net/core/netfilter.c.orig linux-2.6.9/net/core/netfilter.c
>--- 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-09-04 10:35:51.000000000 -0400
>@@ -60,6 +60,12 @@ static struct nf_queue_handler_t {
> } queue_handler[NPROTO];
> static rwlock_t queue_handler_lock = RW_LOCK_UNLOCKED;
> 
>+struct nf_sockopt_ops_wrapper {
>+	struct list_head list;
>+	struct nf_sockopt_ops *ops;
>+	struct module *owner;
>+};
>+
> int nf_register_hook(struct nf_hook_ops *reg)
> {
> 	struct list_head *i;
>@@ -92,16 +98,19 @@ static inline int overlap(int min1, int 
> }
> 
> /* Functions to register sockopt ranges (exclusive). */
>-int nf_register_sockopt(struct nf_sockopt_ops *reg)
>+int nf_register_sockopt_owner(struct nf_sockopt_ops *reg, struct module *owner)
> {
> 	struct list_head *i;
>-	int ret = 0;
>+	struct nf_sockopt_ops_wrapper *newops;
>+	int ret = -ENOMEM;
> 
> 	if (down_interruptible(&nf_sockopt_mutex) != 0)
> 		return -EINTR;
> 
> 	list_for_each(i, &nf_sockopts) {
>-		struct nf_sockopt_ops *ops = (struct nf_sockopt_ops *)i;
>+		struct nf_sockopt_ops_wrapper *opsw = 
>+			(struct nf_sockopt_ops_wrapper *)i;
>+		struct nf_sockopt_ops *ops = opsw->ops;
> 		if (ops->pf == reg->pf
> 		    && (overlap(ops->set_optmin, ops->set_optmax, 
> 				reg->set_optmin, reg->set_optmax)
>@@ -117,27 +126,39 @@ int nf_register_sockopt(struct nf_sockop
> 		}
> 	}
> 
>-	list_add(&reg->list, &nf_sockopts);
>+	newops = kmalloc(sizeof(struct nf_sockopt_ops_wrapper), GFP_KERNEL);
>+	if (!newops)
>+		goto out;
>+	newops->ops = reg;
>+	newops->owner = owner;
>+	list_add(&newops->list, &nf_sockopts);
>+	ret = 0;
> out:
> 	up(&nf_sockopt_mutex);
> 	return ret;
> }
> 
>+int nf_register_sockopt(struct nf_sockopt_ops *reg)
>+{
>+	return nf_register_sockopt_owner(reg, NULL);
>+}
>+
> void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
> {
>+	struct nf_sockopt_ops_wrapper *wrapper;
>+	struct list_head *i;
>+
> 	/* No point being interruptible: we're probably in cleanup_module() */
>- restart:
> 	down(&nf_sockopt_mutex);
>-	if (reg->use != 0) {
>-		/* To be woken by nf_sockopt call... */
>-		/* FIXME: Stuart Young's name appears gratuitously. */
>-		set_current_state(TASK_UNINTERRUPTIBLE);
>-		reg->cleanup_task = current;
>-		up(&nf_sockopt_mutex);
>-		schedule();
>-		goto restart;
>+	list_for_each(i, &nf_sockopts) {
>+		wrapper = (struct nf_sockopt_ops_wrapper *)i;
>+		if (wrapper->ops->pf == reg->pf) {
>+			list_del(&wrapper->list);
>+			kfree(wrapper);
>+			goto out;
>+		}
> 	}
>-	list_del(&reg->list);
>+ out:
> 	up(&nf_sockopt_mutex);
> }
> 
>@@ -289,6 +310,7 @@ static int nf_sockopt(struct sock *sk, i
> 		      char __user *opt, int *len, int get)
> {
> 	struct list_head *i;
>+	struct nf_sockopt_ops_wrapper *opsw;
> 	struct nf_sockopt_ops *ops;
> 	int ret;
> 
>@@ -296,8 +318,12 @@ static int nf_sockopt(struct sock *sk, i
> 		return -EINTR;
> 
> 	list_for_each(i, &nf_sockopts) {
>-		ops = (struct nf_sockopt_ops *)i;
>+		opsw = (struct nf_sockopt_ops_wrapper *)i;
>+		ops = opsw->ops;
> 		if (ops->pf == pf) {
>+			if (!try_module_get(opsw->owner))
>+				goto out_nosup;
>+
> 			if (get) {
> 				if (val >= ops->get_optmin
> 				    && val < ops->get_optmax) {
>@@ -315,16 +341,17 @@ static int nf_sockopt(struct sock *sk, i
> 					goto out;
> 				}
> 			}
>+			module_put(opsw->owner);
> 		}
> 	}
>+ out_nosup:
> 	up(&nf_sockopt_mutex);
> 	return -ENOPROTOOPT;
> 	
>  out:
> 	down(&nf_sockopt_mutex);
> 	ops->use--;
>-	if (ops->cleanup_task)
>-		wake_up_process(ops->cleanup_task);
>+	module_put(opsw->owner);
> 	up(&nf_sockopt_mutex);
> 	return ret;
> }
>@@ -826,6 +853,7 @@ EXPORT_SYMBOL(nf_hooks);
> EXPORT_SYMBOL(nf_register_hook);
> EXPORT_SYMBOL(nf_register_queue_handler);
> EXPORT_SYMBOL(nf_register_sockopt);
>+EXPORT_SYMBOL(nf_register_sockopt_owner);
> EXPORT_SYMBOL(nf_reinject);
> EXPORT_SYMBOL(nf_setsockopt);
> EXPORT_SYMBOL(nf_unregister_hook);
>diff -up linux-2.6.9/net/bridge/netfilter/ebtables.c.orig linux-2.6.9/net/bridge/netfilter/ebtables.c
>--- linux-2.6.9/net/bridge/netfilter/ebtables.c.orig	2007-09-04 10:31:10.000000000 -0400
>+++ linux-2.6.9/net/bridge/netfilter/ebtables.c	2007-09-04 10:35:51.000000000 -0400
>@@ -1482,7 +1482,7 @@ static int __init init(void)
> 	down(&ebt_mutex);
> 	list_named_insert(&ebt_targets, &ebt_standard_target);
> 	up(&ebt_mutex);
>-	if ((ret = nf_register_sockopt(&ebt_sockopts)) < 0)
>+	if ((ret = nf_register_sockopt_owner(&ebt_sockopts, THIS_MODULE)) < 0)
> 		return ret;
> 
> 	printk(KERN_NOTICE "Ebtables v2.0 registered\n");
>diff -up linux-2.6.9/net/ipv6/netfilter/ip6_tables.c.orig linux-2.6.9/net/ipv6/netfilter/ip6_tables.c
>--- linux-2.6.9/net/ipv6/netfilter/ip6_tables.c.orig	2007-09-04 10:31:15.000000000 -0400
>+++ linux-2.6.9/net/ipv6/netfilter/ip6_tables.c	2007-09-04 10:35:51.000000000 -0400
>@@ -1935,7 +1935,7 @@ static int __init init(void)
> 	up(&ip6t_mutex);
> 
> 	/* Register setsockopt */
>-	ret = nf_register_sockopt(&ip6t_sockopts);
>+	ret = nf_register_sockopt_owner(&ip6t_sockopts, THIS_MODULE);
> 	if (ret < 0) {
> 		duprintf("Unable to register sockopts.\n");
> 		return ret;
>diff -up linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c.orig linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c
>--- linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c.orig	2007-09-04 10:30:37.000000000 -0400
>+++ linux-2.6.9/net/ipv4/ipvs/ip_vs_ctl.c	2007-09-04 10:35:51.000000000 -0400
>@@ -2346,7 +2346,7 @@ int ip_vs_control_init(void)
> 
> 	EnterFunction(2);
> 
>-	ret = nf_register_sockopt(&ip_vs_sockopts);
>+	ret = nf_register_sockopt_owner(&ip_vs_sockopts, THIS_MODULE);
> 	if (ret) {
> 		IP_VS_ERR("cannot register sockopt.\n");
> 		return ret;
>diff -up linux-2.6.9/net/ipv4/netfilter/ip_tables.c.orig linux-2.6.9/net/ipv4/netfilter/ip_tables.c
>--- linux-2.6.9/net/ipv4/netfilter/ip_tables.c.orig	2007-09-04 10:31:15.000000000 -0400
>+++ linux-2.6.9/net/ipv4/netfilter/ip_tables.c	2007-09-04 10:35:51.000000000 -0400
>@@ -1867,7 +1867,7 @@ static int __init init(void)
> 	up(&ipt_mutex);
> 
> 	/* Register setsockopt */
>-	ret = nf_register_sockopt(&ipt_sockopts);
>+	ret = nf_register_sockopt_owner(&ipt_sockopts, THIS_MODULE);
> 	if (ret < 0) {
> 		duprintf("Unable to register sockopts.\n");
> 		return ret;
>diff -up linux-2.6.9/net/ipv4/netfilter/ip_conntrack_core.c.orig linux-2.6.9/net/ipv4/netfilter/ip_conntrack_core.c
>--- linux-2.6.9/net/ipv4/netfilter/ip_conntrack_core.c.orig	2007-09-04 10:31:08.000000000 -0400
>+++ linux-2.6.9/net/ipv4/netfilter/ip_conntrack_core.c	2007-09-04 10:35:51.000000000 -0400
>@@ -1332,7 +1332,7 @@ int __init ip_conntrack_init(void)
> 	       ip_conntrack_htable_size, ip_conntrack_max,
> 	       sizeof(struct ip_conntrack));
> 
>-	ret = nf_register_sockopt(&so_getorigdst);
>+	ret = nf_register_sockopt_owner(&so_getorigdst, THIS_MODULE);
> 	if (ret != 0) {
> 		printk(KERN_ERR "Unable to register netfilter socket option\n");
> 		return ret;
>diff -up linux-2.6.9/net/ipv4/netfilter/ip_fw_compat.c.orig linux-2.6.9/net/ipv4/netfilter/ip_fw_compat.c
>--- linux-2.6.9/net/ipv4/netfilter/ip_fw_compat.c.orig	2004-10-18 17:53:51.000000000 -0400
>+++ linux-2.6.9/net/ipv4/netfilter/ip_fw_compat.c	2007-09-04 10:35:51.000000000 -0400
>@@ -251,7 +251,7 @@ static int init_or_cleanup(int init)
> 
> 	if (!init) goto cleanup;
> 
>-	ret = nf_register_sockopt(&sock_ops);
>+	ret = nf_register_sockopt_owner(&sock_ops, THIS_MODULE);
> 
> 	if (ret < 0)
> 		goto cleanup_nothing;
>diff -up linux-2.6.9/net/ipv4/netfilter/arp_tables.c.orig linux-2.6.9/net/ipv4/netfilter/arp_tables.c
>--- linux-2.6.9/net/ipv4/netfilter/arp_tables.c.orig	2007-09-04 10:31:15.000000000 -0400
>+++ linux-2.6.9/net/ipv4/netfilter/arp_tables.c	2007-09-04 10:35:51.000000000 -0400
>@@ -1298,7 +1298,7 @@ static int __init init(void)
> 	up(&arpt_mutex);
> 
> 	/* Register setsockopt */
>-	ret = nf_register_sockopt(&arpt_sockopts);
>+	ret = nf_register_sockopt_owner(&arpt_sockopts, THIS_MODULE);
> 	if (ret < 0) {
> 		duprintf("Unable to register sockopts.\n");
> 		return ret;

Actions: View | Diff

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