summaryrefslogtreecommitdiffstats
path: root/net/vmw_vsock
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-24 19:32:50 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-09 16:28:23 -0500
commitd838df2e5dcbb6ed4d82854869e9a30f9aeef6da (patch)
treedd72df4d21aa997d830a80683b5afc80852f5a01 /net/vmw_vsock
parent56c39fb67cdb665ae67fba4975f5e20e6614cda6 (diff)
downloadlinux-stable-d838df2e5dcbb6ed4d82854869e9a30f9aeef6da.tar.gz
linux-stable-d838df2e5dcbb6ed4d82854869e9a30f9aeef6da.tar.bz2
linux-stable-d838df2e5dcbb6ed4d82854869e9a30f9aeef6da.zip
vmci: propagate msghdr all way down to __qp_memcpy_from_queue()
... and switch it to memcpy_to_msg() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/vmw_vsock')
-rw-r--r--net/vmw_vsock/vmci_transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index c1c038952973..20a0ba3bfff6 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1840,9 +1840,9 @@ static ssize_t vmci_transport_stream_dequeue(
int flags)
{
if (flags & MSG_PEEK)
- return vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg->msg_iov, len, 0);
+ return vmci_qpair_peekv(vmci_trans(vsk)->qpair, msg, len, 0);
else
- return vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg->msg_iov, len, 0);
+ return vmci_qpair_dequev(vmci_trans(vsk)->qpair, msg, len, 0);
}
static ssize_t vmci_transport_stream_enqueue(