Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6067828 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Greg Kroah-Hartman
Browse files

vhost/vsock: fix packet delivery order to monitoring devices 



[ Upstream commit 107bc0766b9feb5113074c753735a3f115c2141f ]

We want to deliver packets to monitoring devices before it is
put in the virtqueue, to avoid that replies can appear in the
packet capture before the transmitted packet.

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 96fc3559

drivers/vhost/vsock.c

+5 −5
Original line number Diff line number Diff line
@@ -182,14 +182,14 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, 
			break;

		}



		vhost_add_used(vq, head, sizeof(pkt->hdr) + payload_len);

		added = true;



		/* Deliver to monitoring devices all correctly transmitted

		 * packets.

		/* Deliver to monitoring devices all packets that we

		 * will transmit.

		 */

		virtio_transport_deliver_tap_pkt(pkt);



		vhost_add_used(vq, head, sizeof(pkt->hdr) + payload_len);

		added = true;



		pkt->off += payload_len;

		total_len += payload_len;