diff options
| author | Jason Wang | 2011-01-17 09:11:17 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-03-13 22:08:04 +0100 |
| commit | 783e3988544b94ff3918666b9f36866ac547fba1 (patch) | |
| tree | e05c17f7e368490e3d34750cc2f6b8e2092ef1e5 /drivers/vhost/net.c | |
| parent | vhost-net: Unify the code of mergeable and big buffer handling (diff) | |
| download | kernel-qcow2-linux-783e3988544b94ff3918666b9f36866ac547fba1.tar.gz kernel-qcow2-linux-783e3988544b94ff3918666b9f36866ac547fba1.tar.xz kernel-qcow2-linux-783e3988544b94ff3918666b9f36866ac547fba1.zip | |
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>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 0329c411bbf1..57203014c457 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -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; } |