From eac1d96f4fb365d7ac4297c799b0bf7f252b2792 Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Sun, 7 Apr 2013 01:52:01 +0000 Subject: [PATCH] --- yaml --- r: 362385 b: refs/heads/master c: 680d04e0ba7e926233e3b9cee59125ce181f66ba h: refs/heads/master i: 362383: 4efc062dfe62ff67d6e4449e8acf31c2a06c4a1d v: v3 --- [refs] | 2 +- trunk/net/vmw_vsock/vmci_transport.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b08cc9b1acb2..438b8bd94be7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60085c3d009b0df252547adb336d1ccca5ce52ec +refs/heads/master: 680d04e0ba7e926233e3b9cee59125ce181f66ba diff --git a/trunk/net/vmw_vsock/vmci_transport.c b/trunk/net/vmw_vsock/vmci_transport.c index 1f6508e249ae..5e04d3d96285 100644 --- a/trunk/net/vmw_vsock/vmci_transport.c +++ b/trunk/net/vmw_vsock/vmci_transport.c @@ -1736,6 +1736,8 @@ static int vmci_transport_dgram_dequeue(struct kiocb *kiocb, if (flags & MSG_OOB || flags & MSG_ERRQUEUE) return -EOPNOTSUPP; + msg->msg_namelen = 0; + /* Retrieve the head sk_buff from the socket's receive queue. */ err = 0; skb = skb_recv_datagram(&vsk->sk, flags, noblock, &err); @@ -1768,7 +1770,6 @@ static int vmci_transport_dgram_dequeue(struct kiocb *kiocb, if (err) goto out; - msg->msg_namelen = 0; if (msg->msg_name) { struct sockaddr_vm *vm_addr;