lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 10 Aug 2021 14:40:15 +0300 From: Arseny Krasnov <arseny.krasnov@...persky.com> To: Stefan Hajnoczi <stefanha@...hat.com>, Stefano Garzarella <sgarzare@...hat.com>, "Michael S. Tsirkin" <mst@...hat.com>, Jason Wang <jasowang@...hat.com>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Arseny Krasnov <arseny.krasnov@...persky.com>, Jorgen Hansen <jhansen@...are.com>, Norbert Slusarek <nslusarek@....net>, Colin Ian King <colin.king@...onical.com>, Andra Paraschiv <andraprs@...zon.com> CC: <kvm@...r.kernel.org>, <virtualization@...ts.linux-foundation.org>, <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <stsp2@...dex.ru>, <oxffffaa@...il.com> Subject: [RFC PATCH v2 2/5] vhost/vsock: support MSG_EOR bit processing It works in the same way as 'end-of-message' bit: if packet has 'EOM' bit, also check for 'EOR' bit. Signed-off-by: Arseny Krasnov <arseny.krasnov@...persky.com> --- drivers/vhost/vsock.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index feaf650affbe..06fc132b13c8 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -114,7 +114,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, size_t nbytes; size_t iov_len, payload_len; int head; - bool restore_flag = false; + uint32_t flags_to_restore = 0; spin_lock_bh(&vsock->send_pkt_list_lock); if (list_empty(&vsock->send_pkt_list)) { @@ -187,7 +187,12 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, */ if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM) { pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM); - restore_flag = true; + flags_to_restore |= le32_to_cpu(VIRTIO_VSOCK_SEQ_EOM); + + if (le32_to_cpu(pkt->hdr.flags & VIRTIO_VSOCK_SEQ_EOR)) { + pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); + flags_to_restore |= le32_to_cpu(VIRTIO_VSOCK_SEQ_EOR); + } } } @@ -224,8 +229,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, * to send it with the next available buffer. */ if (pkt->off < pkt->len) { - if (restore_flag) - pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM); + pkt->hdr.flags |= cpu_to_le32(flags_to_restore); /* We are queueing the same virtio_vsock_pkt to handle * the remaining bytes, and we want to deliver it -- 2.25.1
Powered by blists - more mailing lists