diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-30 05:03:53 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 12:25:12 -0700 |
| commit | 9d410c796067686b1e032d54ce475b7055537138 (patch) | |
| tree | 4442bdbe4a4be1cce024f2e83a12b7404ef935fa /net/core | |
| parent | 63ca2d74ea4f9c7a7ac082c915609a7b224908e7 (diff) | |
| download | blackbird-op-linux-9d410c796067686b1e032d54ce475b7055537138.tar.gz blackbird-op-linux-9d410c796067686b1e032d54ce475b7055537138.zip | |
net: fix sk_forward_alloc corruption
On UDP sockets, we must call skb_free_datagram() with socket locked,
or risk sk_forward_alloc corruption. This requirement is not respected
in SUNRPC.
Add a convenient helper, skb_free_datagram_locked() and use it in SUNRPC
Reported-by: Francis Moreau <francis.moro@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/datagram.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c index 1c6cf3a1a4f6..4ade3011bb3c 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -224,6 +224,15 @@ void skb_free_datagram(struct sock *sk, struct sk_buff *skb) consume_skb(skb); sk_mem_reclaim_partial(sk); } +EXPORT_SYMBOL(skb_free_datagram); + +void skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb) +{ + lock_sock(sk); + skb_free_datagram(sk, skb); + release_sock(sk); +} +EXPORT_SYMBOL(skb_free_datagram_locked); /** * skb_kill_datagram - Free a datagram skbuff forcibly @@ -752,5 +761,4 @@ unsigned int datagram_poll(struct file *file, struct socket *sock, EXPORT_SYMBOL(datagram_poll); EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec); EXPORT_SYMBOL(skb_copy_datagram_iovec); -EXPORT_SYMBOL(skb_free_datagram); EXPORT_SYMBOL(skb_recv_datagram); |
