diff options
| author | Jason Wang <jasowang@redhat.com> | 2015-02-15 11:35:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-15 19:17:15 +0300 |
| commit | 0960b6417e9ed8e4b4aa3c54e257324a9352f40b (patch) | |
| tree | 57ed67565cc5723eedfb15bc30894f29069177af /net/core | |
| parent | ca9f1fd263e14765a4c213e46940876ad78fce28 (diff) | |
| download | linux-0960b6417e9ed8e4b4aa3c54e257324a9352f40b.tar.xz | |
vhost_net: fix wrong iter offset when setting number of buffers
In commit ba7438aed924 ("vhost: don't bother copying iovecs in
handle_rx(), kill memcpy_toiovecend()"), we advance iov iter fixup
sizeof(struct virtio_net_hdr) bytes and fill the number of buffers
after doing the socket recvmsg(). This work well but was broken after
commit 6e03f896b52c ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") which tries
to advance sizeof(struct virtio_net_hdr_mrg_rxbuf). It will fill the
number of buffers at the wrong place. This patch fixes this.
Fixes 6e03f896b52c
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Cc: David S. Miller <davem@davemloft.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions