From: Daniel Borkmann <dborkman@redhat.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
Salam Noureddine <noureddine@aristanetworks.com>,
Ben Greear <greearb@candelatech.com>
Subject: Re: [PATCH net v2] packet: fix use after free race in send path when dev is released
Date: Thu, 21 Nov 2013 16:02:49 +0100 [thread overview]
Message-ID: <528E2099.90208@redhat.com> (raw)
In-Reply-To: <1385044842.10637.41.camel@edumazet-glaptop2.roam.corp.google.com>
On 11/21/2013 03:40 PM, Eric Dumazet wrote:
> On Thu, 2013-11-21 at 10:47 +0100, Daniel Borkmann wrote:
>
>> +static void packet_dev_put_deferred(struct rcu_head *head)
>> +{
>> + struct packet_sock *po = container_of(head, struct packet_sock, rcu);
>> + struct sock *sk = &po->sk;
>> +
>> + spin_lock(&po->bind_lock);
>> + po->ifindex = -1;
>> +
>> + if (po->prot_hook.dev) {
>> + dev_put(po->prot_hook.dev);
>> + po->prot_hook.dev = NULL;
>> + }
>> +
>> + spin_unlock(&po->bind_lock);
>> + sock_put(sk);
>> +}
>
> I dont think this is needed.
>
>>
>> static int packet_notifier(struct notifier_block *this,
>> unsigned long msg, void *ptr)
>> @@ -3325,13 +3354,13 @@ static int packet_notifier(struct notifier_block *this,
>> if (!sock_flag(sk, SOCK_DEAD))
>> sk->sk_error_report(sk);
>> }
>> + spin_unlock(&po->bind_lock);
>> +
>> if (msg == NETDEV_UNREGISTER) {
>> - po->ifindex = -1;
>> - if (po->prot_hook.dev)
>> - dev_put(po->prot_hook.dev);
>> - po->prot_hook.dev = NULL;
>> + sock_hold(sk);
>> + call_rcu(&po->rcu,
>> + packet_dev_put_deferred);
>> }
>> - spin_unlock(&po->bind_lock);
>> }
>
> Its not needed because you now take a reference on dev
> in packet_cached_dev_get()
That was also my first thought, but Salam pointed out to me, that in case
we have a situation such as ...
in packet_cached_dev_get():
rcu_read_lock();
dev = rcu_dereference(po->cached_dev); in packet_notifier():
---> CPU1: dev_put(po->prot_hook.dev);
---> CPU0:
if (dev)
dev_hold(dev);
rcu_read_unlock();
... we could reach a refcount of 0, before we increase it back to 1. Not sure
if this can actually happen, maybe in preemptible RCU where read-side critical
sections to be preempted? So with this rather paranoid approach we make sure
to avoid such a situation as we wait a grace period when readers finished.
> Otherwise, patch looks good !
Thanks!
next prev parent reply other threads:[~2013-11-21 15:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 9:47 [PATCH net v2] packet: fix use after free race in send path when dev is released Daniel Borkmann
2013-11-21 14:40 ` Eric Dumazet
2013-11-21 15:02 ` Daniel Borkmann [this message]
2013-11-21 15:27 ` Eric Dumazet
2013-11-21 15:28 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=528E2099.90208@redhat.com \
--to=dborkman@redhat.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=greearb@candelatech.com \
--cc=netdev@vger.kernel.org \
--cc=noureddine@aristanetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).