]> err.no Git - linux-2.6/commit
udp: Fix rcv socket locking
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 15 Sep 2008 18:48:46 +0000 (11:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Sep 2008 18:48:46 +0000 (11:48 -0700)
commit93821778def10ec1e69aa3ac10adee975dad4ff3
tree5cd95c0592407ac49b4f6bd9aa8ba71d93500aae
parentcff502a38394fd33693f6233e03fca363dfa956d
udp: Fix rcv socket locking

The previous patch in response to the recursive locking on IPsec
reception is broken as it tries to drop the BH socket lock while in
user context.

This patch fixes it by shrinking the section protected by the
socket lock to sock_queue_rcv_skb only.  The only reason we added
the lock is for the accounting which happens in that function.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/udp.c