[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1385044842.10637.41.camel@edumazet-glaptop2.roam.corp.google.com>
Date: Thu, 21 Nov 2013 06:40:42 -0800
From: Eric Dumazet <eric.dumazet@...il.com>
To: Daniel Borkmann <dborkman@...hat.com>
Cc: davem@...emloft.net, netdev@...r.kernel.org,
Salam Noureddine <noureddine@...stanetworks.com>,
Ben Greear <greearb@...delatech.com>
Subject: Re: [PATCH net v2] packet: fix use after free race in send path
when dev is released
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()
Otherwise, patch looks good !
--
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