]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
net: fix sk_forward_alloc corruptions
authorEric Dumazet <eric.dumazet@gmail.com>
Sat, 29 May 2010 07:20:48 +0000 (00:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Feb 2012 19:28:51 +0000 (11:28 -0800)
commit956a79d503998a763dd71847f2f9eb19349c2aba
tree612b5bae398638984dc2a101a53b079077a93fea
parentaa4ba12335659a1afd79d430f038114ce1434690
net: fix sk_forward_alloc corruptions

commit 2903037400a26e7c0cc93ab75a7d62abfacdf485 upstream.

As David found out, sock_queue_err_skb() should be called with socket
lock hold, or we risk sk_forward_alloc corruption, since we use non
atomic operations to update this field.

This patch adds bh_lock_sock()/bh_unlock_sock() pair to three spots.
(BH already disabled)

1) skb_tstamp_tx()
2) Before calling ip_icmp_error(), in __udp4_lib_err()
3) Before calling ipv6_icmp_error(), in __udp6_lib_err()

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: 单卫 <shanwei88@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/skbuff.c
net/ipv4/udp.c
net/ipv6/udp.c