redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

vhost: lock receive queue, not the socket 

vhost takes a sock lock to try and prevent
the skb from being pulled from the receive queue
after skb_peek.  However this is not the right lock to use for that,
sk_receive_queue.lock is. Fix that up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hifive-unleashed-5.1
Jason Wang 2011-01-17 16:11:17 +08:00 committed by Michael S. Tsirkin
parent 94249369e9
commit 783e398854
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/vhost/net.c
View File

@ -213,12 +213,13 @@ static int peek_head_len(struct sock *sk)
{
struct sk_buff *head;
int len = 0;
unsigned long flags;
lock_sock(sk);
spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
head = skb_peek(&sk->sk_receive_queue);
if (head)
if (likely(head))
len = head->len;
release_sock(sk);
spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
return len;
}