| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <m1ty40tn83.fsf@fess.ebiederm.org>
Date: Thu, 12 Jan 2012 17:17:32 -0800
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Francesco Ruggeri <fruggeri@...stanetworks.com>
Cc: netdev@...r.kernel.org, Eric Dumazet <eric.dumazet@...il.com>,
David Miller <davem@...emloft.ne>
Subject: Re: Race condition in ipv6 code
Francesco Ruggeri <fruggeri@...stanetworks.com> writes:
> We have hit a race condition in ipv6 code when setting
> /proc/sys/net/ipv6/conf/*/forwarding. This happens when the syscall
> has to be restarted.
>
> I wonder if anyone else has run into the same issue.
>
> The current sequence in addrconf_sysctl_forward() and
> addrconf_fixup_forwarding() is as follows:
> - change the parameter in idev->cnf.forwarding (using proc_dointvec())
> - try to get the rtnl lock
> - if cannot get the lock then restore the original value in
> idev->cnf.forwarding and restart the syscall.
>
> While this is going on, the ipv6 code may access idev->cnf.forwarding
> and get an incorrect value.
> In our case we were in addrconf_ifdown (holding the rtnl lock) and
> calling __ipv6_ifa_notify(RTM_DELADDR, ifa) on the idev->addr_list
> entries.
> __ipv6_ifa_notify() only invokes addrconf_leave_anycast() if
> idev->cnf.forwarding is set. Because a process trying to set
> forwarding to 0 was stuck in the restart_syscall sequence above
> flipping the flag on and off, we erroneously read the flag as 0, with
> the result that addrconf_leave_anycast() was not invoked, some
> idev->ac_list entries were never released, idev was never freed and
> kept a reference to its net_device, and the net_device was never freed
> and caused the "unregister_netdevice: waiting for xxx to become free"
> message forever. In our case this was a vlan interfaces that was being
> deleted, so we ended up getting stuck in vlan_ioctl_handler() holding
> vlan_ioctl_mutex with further bad consequences.
> The following diffs (for 2.6.38, but the same logic seems to be used
> in 3.2) address the issue by modifying idev->cnf.forwarding only after
> the rtnl lock is acquired. There is a similar situation for
> disable_ipv6.
> Any comments are appreciated.
Interesting. So ultimately the problem is not the syscall restart
although that exacerbates it, the problem is that we expect
idev->cnf.forwarding to be protected by the rtnl_lock and it is not.
At first read through your patch looks good. I am a bit worried that
we have some versions of the value: aka
net->ipv6.devconf_dflt->forwarding not protected by the rtnl_lock
and other version of the value protected by the rtnl_lock.
That just seems confusing.
We can't hold the rtnl_lock around proc_dointvec because that can sleep
indefinitely in copy_from_user. So it looks like your change to create
a temporary ctl_table and call proc_dointvec seems very reasonable,
and necessary however we do this.
I don't know if there are other places that need the rtnl_lock that
but your patch below looks like it makes things better for all of
the right reasons. So on that score.
Acked-by: "Eric W. Biederman" <ebiederm@...ssion.com>
Unless someone wants to volunteer to sort out the impedance mismatch
between these tunables and the sysctl infrastructure. I suggest
you resend this patch to David with [PATCH] in the subject line.
I would also suggest a little clearer description why
idev->cnf.forwarding and idev->cnf.disable_ipv6 need rntl_lock
protection.
But overall this looks like a pretty obvious bug fix, to the
problem that we need the rtnl_lock to protect idev->cnf.forwarding,
and we currently allow updates to idev->cnf.forwarding without
holding the rtnl_lock.
Eric
> Francesco Ruggeri
>
>
> --- a/net/ipv6/addrconf.c 2011-03-14 18:20:32.000000000 -0700
> +++ b/net/ipv6/addrconf.c 2012-01-10 12:56:01.458880292 -0800
> @@ -507,29 +507,31 @@ static void addrconf_forward_change(stru
> rcu_read_unlock();
> }
>
> -static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
> +static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
> {
> struct net *net;
> + int old;
>
> net = (struct net *)table->extra2;
> - if (p == &net->ipv6.devconf_dflt->forwarding)
> + if (p == &net->ipv6.devconf_dflt->forwarding) {
> + *p = newf;
> return 0;
> + }
>
> - if (!rtnl_trylock()) {
> - /* Restore the original values before restarting */
> - *p = old;
> + if (!rtnl_trylock())
> return restart_syscall();
> - }
> +
> + old = *p;
> + *p = newf;
>
> if (p == &net->ipv6.devconf_all->forwarding) {
> - __s32 newf = net->ipv6.devconf_all->forwarding;
> net->ipv6.devconf_dflt->forwarding = newf;
> addrconf_forward_change(net, newf);
> - } else if ((!*p) ^ (!old))
> + } else if ((!newf) ^ (!old))
> dev_forward_change((struct inet6_dev *)table->extra1);
> rtnl_unlock();
>
> - if (*p)
> + if (newf)
> rt6_purge_dflt_routers(net);
> return 1;
> }
> @@ -4165,9 +4167,17 @@ int addrconf_sysctl_forward(ctl_table *c
> int *valp = ctl->data;
> int val = *valp;
> loff_t pos = *ppos;
> + ctl_table lctl;
> int ret;
>
> - ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
> + /*
> + * ctl->data points to idev->cnf.forwarding, we should
> + * not modify it until we get the rtnl lock.
> + */
> + lctl = *ctl;
> + lctl.data = &val;
> +
> + ret = proc_dointvec(&lctl, write, buffer, lenp, ppos);
>
> if (write)
> ret = addrconf_fixup_forwarding(ctl, valp, val);
> @@ -4205,26 +4215,28 @@ static void addrconf_disable_change(stru
> rcu_read_unlock();
> }
>
> -static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int old)
> +static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)
> {
> struct net *net;
> + int old;
>
> net = (struct net *)table->extra2;
>
> - if (p == &net->ipv6.devconf_dflt->disable_ipv6)
> + if (p == &net->ipv6.devconf_dflt->disable_ipv6) {
> + *p = newf;
> return 0;
> + }
>
> - if (!rtnl_trylock()) {
> - /* Restore the original values before restarting */
> - *p = old;
> + if (!rtnl_trylock())
> return restart_syscall();
> - }
> +
> + old = *p;
> + *p = newf;
>
> if (p == &net->ipv6.devconf_all->disable_ipv6) {
> - __s32 newf = net->ipv6.devconf_all->disable_ipv6;
> net->ipv6.devconf_dflt->disable_ipv6 = newf;
> addrconf_disable_change(net, newf);
> - } else if ((!*p) ^ (!old))
> + } else if ((!newf) ^ (!old))
> dev_disable_change((struct inet6_dev *)table->extra1);
>
> rtnl_unlock();
> @@ -4238,9 +4250,17 @@ int addrconf_sysctl_disable(ctl_table *c
> int *valp = ctl->data;
> int val = *valp;
> loff_t pos = *ppos;
> + ctl_table lctl;
> int ret;
>
> - ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
> + /*
> + * ctl->data points to idev->cnf.disable_ipv6, we should
> + * not modify it until we get the rtnl lock.
> + */
> + lctl = *ctl;
> + lctl.data = &val;
> +
> + ret = proc_dointvec(&lctl, write, buffer, lenp, ppos);
>
> if (write)
> ret = addrconf_disable_ipv6(ctl, valp, val);
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists