OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: Fix sysctl unregistration deadlock 

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-02-26 06:55:31 +00:00 committed by David S. Miller
parent 5a5990d309
commit b325fddb7f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv6/addrconf.c
View File

@ -493,15 +493,17 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
read_unlock(&dev_base_lock); read_unlock(&dev_base_lock);
} }
static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old) static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
{ {
struct net *net; struct net *net;
net = (struct net *)table->extra2; net = (struct net *)table->extra2;
if (p == &net->ipv6.devconf_dflt->forwarding) if (p == &net->ipv6.devconf_dflt->forwarding)
return; return 0;
if (!rtnl_trylock())
return -ERESTARTSYS;
rtnl_lock();
if (p == &net->ipv6.devconf_all->forwarding) { if (p == &net->ipv6.devconf_all->forwarding) {
__s32 newf = net->ipv6.devconf_all->forwarding; __s32 newf = net->ipv6.devconf_all->forwarding;
net->ipv6.devconf_dflt->forwarding = newf; net->ipv6.devconf_dflt->forwarding = newf;
@ -512,6 +514,7 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
if (*p) if (*p)
rt6_purge_dflt_routers(net); rt6_purge_dflt_routers(net);
return 1;
} }
#endif #endif
@ -3983,7 +3986,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos); ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
if (write) if (write)
addrconf_fixup_forwarding(ctl, valp, val); ret = addrconf_fixup_forwarding(ctl, valp, val);
return ret; return ret;
} }
@ -4019,8 +4022,7 @@ static int addrconf_sysctl_forward_strategy(ctl_table *table,
} }
*valp = new; *valp = new;
addrconf_fixup_forwarding(table, valp, val); return addrconf_fixup_forwarding(table, valp, val);
return 1;
} }
static struct addrconf_sysctl_table static struct addrconf_sysctl_table