netdev - Re: [PATCH net] packet: fix use after free race in send path when dev is released

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1384903998.8604.131.camel@edumazet-glaptop2.roam.corp.google.com>
Date:	Tue, 19 Nov 2013 15:33:18 -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] packet: fix use after free race in send path when
 dev is released

On Wed, 2013-11-20 at 00:08 +0100, Daniel Borkmann wrote:
> Salam reported a use after free bug in PF_PACKET that occurs when
> we're sending out frames on a socket bound device and suddenly the
> netdevice is being unregistered. It appears that commit 827d9780
> introduced a possible race condition between {t,}packet_snd and
> packet_notifier. In the case of a bound socket, packet_notifier can
> drop the last reference to the net_device and {t,}packet_snd might
> end up sending a packet over a freed net_device.
> 
> To avoid reverting 827d9780 entirely, we could make use of po->running
> member that gets reset when we're calling __unregister_prot_hook() in
> packet_notifier() when we receive NETDEV_DOWN or NETDEV_UNREGISTER
> notification. Plus, we still need to hold ref to the netdev, so
> that we can assure it won't be released while we're in send path.
> We try to avoid holding the bind lock all over send code as this
> would likely make it worse when multiple threads want to send on
> the same socket (in mmap code we're holding the pg_vec_lock mutex
> all over the send code; we should try to get rid of that at some
> point in time!). This at least buys us the possibility that we don't
> have to walk over the entire dev list in dev_get_by_index() that we
> would need to do as before 827d9780, which can just hurt as well
> with many devices registered.
> 
> Fixes: 827d978037d7 ("af-packet: Use existing netdev reference for bound sockets.")
> Signed-off-by: Daniel Borkmann <dborkman@...hat.com>
> Signed-off-by: Salam Noureddine <noureddine@...stanetworks.com>
> Tested-by: Salam Noureddine <noureddine@...stanetworks.com>
> Cc: Ben Greear <greearb@...delatech.com>
> ---
>  net/packet/af_packet.c | 33 ++++++++++++++++++++-------------
>  1 file changed, 20 insertions(+), 13 deletions(-)
> 
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index 2e8286b..385b2cc 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -1045,6 +1045,19 @@ static void *__prb_previous_block(struct packet_sock *po,
>  	return prb_lookup_block(po, rb, previous, status);
>  }
>  
> +static struct net_device *dev_get_packet_sock(struct packet_sock *po)
> +{
> +	struct net_device *dev;
> +
> +	spin_lock(&po->bind_lock);
> +	dev = po->prot_hook.dev;
> +	if (dev)
> +		dev_hold(dev);
> +	spin_unlock(&po->bind_lock);
> +
> +	return dev;
> +}
> +

...

dev_get_by_index() would be faster in fact.

Are you sure rcu_read_lock() is not possible ?

rcu_read_lock();
dev = rcu_dereference(po->active_device);
if (dev)
	dev_hold(dev);
rcu_read_unlock();



--
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