summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-04-06 10:49:10 +0200
committerDavid S. Miller <davem@davemloft.net>2012-04-06 05:07:21 -0400
commit110c43304db6f06490961529536c362d9ac5732f (patch)
tree5729bd4310cffaea7d0e4fbe3451d26e78271179
parent4a7e7c2ad540e54c75489a70137bf0ec15d3a127 (diff)
downloadlinux-3.10-110c43304db6f06490961529536c362d9ac5732f.tar.gz
linux-3.10-110c43304db6f06490961529536c362d9ac5732f.tar.bz2
linux-3.10-110c43304db6f06490961529536c362d9ac5732f.zip
net: fix a race in sock_queue_err_skb()
As soon as an skb is queued into socket error queue, another thread can consume it, so we are not allowed to reference skb anymore, or risk use after free. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/skbuff.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f223cdc75da..baf8d281152 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3161,6 +3161,8 @@ static void sock_rmem_free(struct sk_buff *skb)
*/
int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
{
+ int len = skb->len;
+
if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
(unsigned)sk->sk_rcvbuf)
return -ENOMEM;
@@ -3175,7 +3177,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
skb_queue_tail(&sk->sk_error_queue, skb);
if (!sock_flag(sk, SOCK_DEAD))
- sk->sk_data_ready(sk, skb->len);
+ sk->sk_data_ready(sk, len);
return 0;
}
EXPORT_SYMBOL(sock_queue_err_skb);