Skip to contentSkip to conversation

vhost/net: fix up num_buffers endian-ness

PATCH Applied Michael S. Tsirkin 3 participants 3 messages Feb 3, 2015 – Feb 4, 2015

Subsystems (5)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 vhost/net: fix up num_buffers endian-ness

In virtio 1.0 mode, when mergeable buffers are enabled on a big-endian host, num_buffers wasn't byte-swapped correctly, so large incoming packets got corrupted.

To fix, fill it in within hdr - this also makes sure it gets the correct type.

---

It seems important to get this into 3.19, otherwise VIRTIO_1 feature bit is unreliable.

Dave, do you plan another pull request for 3.19?
If yes pls merge this, if not pls let me know and I'll try to send it to Linus directly.

 drivers/vhost/net.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vhost/net.c +3 -1
index d415d69..9484d56 100644
@@ -650,8 +650,10 @@ static void handle_rx(struct vhost_net *net)
 			break;
 		}
 		/* TODO: Should check and handle checksum. */
+
+		hdr.num_buffers = cpu_to_vhost16(vq, headcount);
 		if (likely(mergeable) &&
-		    memcpy_toiovecend(nvq->hdr, (unsigned char *)&headcount,
+		    memcpy_toiovecend(nvq->hdr, (void *)&hdr.num_buffers,
 				      offsetof(typeof(hdr), num_buffers),
 				      sizeof hdr.num_buffers)) {
 			vq_err(vq, "Failed num_buffers write");
Signature · 1 line
MST
maintainer Applied
#1 lore raw

From: "Michael S. Tsirkin" <[email protected]>
Date: Tue, 3 Feb 2015 11:07:06 +0200

Quoted 8 lines

In virtio 1.0 mode, when mergeable buffers are enabled on a big-endian host, num_buffers wasn't byte-swapped correctly, so large incoming packets got corrupted.

To fix, fill it in within hdr - this also makes sure it gets the correct type.

Applied.

#2 lore raw
Quoted 7 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Tue, 3 Feb 2015 11:07:06 +0200

Quoted 4 lines

In virtio 1.0 mode, when mergeable buffers are enabled on a big-endian host, num_buffers wasn't byte-swapped correctly, so large incoming packets got corrupted.

Quoted 6 lines
Quoted 4 lines

To fix, fill it in within hdr - this also makes sure it gets the correct type.

Applied.

FWIW, conflict with iov_iter patches is trivial; once it shows up in your kernel.org tree I can either rebase the series or just push #merge-candidate - whichever you prefer. Linus usually prefers the second variant, but then he seriously dislikes rebasing of any sort; I've no idea what your preferences are in that area...