Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7d460db953d6d205e4c8ecc2017aea1ec22b6c9a Commit: 7d460db953d6d205e4c8ecc2017aea1ec22b6c9a Parent: ee63d22b8953fd0dde22f52c0bc17a304ae50403 Author: Daniel Lezcano <[EMAIL PROTECTED]> AuthorDate: Fri Jan 18 23:52:35 2008 -0800 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Mon Jan 28 15:08:04 2008 -0800
[IPV6]: Fix ip6_frag ctl Alexey Dobriyan reported an oops when unsharing the network indefinitely inside a loop. This is because the ip6_frag is not per namespace while the ctls are. That happens at the fragment timer expiration: inet_frag_secret_rebuild function is called and this one restarts the timer using the value stored inside the sysctl field. "mod_timer(&f->secret_timer, now + f->ctl->secret_interval);" When the network is unshared, ip6_frag.ctl is initialized with the new sysctl instances, but ip6_frag has only one instance. A race in this case will appear because f->ctl can be modified during the read access in the timer callback. Until the ip6_frag is not per namespace, I discard the assignation to the ctl field of ip6_frags in ip6_frag_sysctl_init when the network namespace is not the init net. Signed-off-by: Daniel Lezcano <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- net/ipv6/reassembly.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 5cd0bc6..4dfcddc 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -627,6 +627,9 @@ static struct inet6_protocol frag_protocol = void ipv6_frag_sysctl_init(struct net *net) { + if (net != &init_net) + return; + ip6_frags.ctl = &net->ipv6.sysctl.frags; } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html