]> git.hungrycats.org Git - linux/commit
neighbour: fix a race in neigh_destroy()
authorEric Dumazet <eric.dumazet@gmail.com>
Fri, 28 Jun 2013 09:37:42 +0000 (02:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Jul 2013 23:25:58 +0000 (16:25 -0700)
commitb42e9bf6ff206b1aca6a901fd7c89a8e09a5bda7
treece407dde31ab2263cb31588d3edff73d694f9c04
parent0ddce1514e3236adee49a760d2d6339f506b5680
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/neighbour.c