neighbour: fix a race in neigh_destroy()
authorEric Dumazet <eric.dumazet@gmail.com>
Fri, 28 Jun 2013 09:37:42 +0000 (02:37 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 2 Aug 2013 20:14:46 +0000 (22:14 +0200)
commitcbdcfcd320e5847c8edde45848562aebb1f01f90
tree8c16c83723b9e3a18e79d87ac3eb7a7060a58c10
parent694c73ea108919b72b689a20c218c4249f0fbffb
neighbour: fix a race in neigh_destroy()

[ Upstream commit c9ab4d85de222f3390c67aedc9c18a50e767531e ]

There is a race in neighbour code, because neigh_destroy() uses
skb_queue_purge(&neigh->arp_queue) without holding neighbour lock,
while other parts of the code assume neighbour rwlock is what
protects arp_queue

Convert all skb_queue_purge() calls to the __skb_queue_purge() variant

Use __skb_queue_head_init() instead of skb_queue_head_init()
to make clear we do not use arp_queue.lock

And hold neigh->lock in neigh_destroy() to close the race.

Reported-by: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/core/neighbour.c