netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: Jonathan Corbet <corbet@lwn.net>,
	 Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
	 Jason Wang <jasowang@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	 Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	 Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
	Shuah Khan <shuah@kernel.org>,
	 linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	 netdev@vger.kernel.org, kvm@vger.kernel.org,
	 virtualization@lists.linux-foundation.org,
	linux-kselftest@vger.kernel.org,
	 Yuri Benditovich <yuri.benditovich@daynix.com>,
	 Andrew Melnychenko <andrew@daynix.com>,
	 Stephen Hemminger <stephen@networkplumber.org>,
	gur.stavi@huawei.com,  Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH RFC v5 05/10] tun: Pad virtio header with zero
Date: Tue, 08 Oct 2024 15:54:25 +0900	[thread overview]
Message-ID: <20241008-rss-v5-5-f3cf68df005d@daynix.com> (raw)
In-Reply-To: <20241008-rss-v5-0-f3cf68df005d@daynix.com>

tun used to simply advance iov_iter when it needs to pad virtio header,
which leaves the garbage in the buffer as is. This is especially
problematic when tun starts to allow enabling the hash reporting
feature; even if the feature is enabled, the packet may lack a hash
value and may contain a hole in the virtio header because the packet
arrived before the feature gets enabled or does not contain the
header fields to be hashed. If the hole is not filled with zero, it is
impossible to tell if the packet lacks a hash value.

In theory, a user of tun can fill the buffer with zero before calling
read() to avoid such a problem, but leaving the garbage in the buffer is
awkward anyway so fill the buffer in tun.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 drivers/net/tun_vnet.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/tun_vnet.h b/drivers/net/tun_vnet.h
index 7c7f3f6d85e9..c40bde0fdf8c 100644
--- a/drivers/net/tun_vnet.h
+++ b/drivers/net/tun_vnet.h
@@ -138,7 +138,8 @@ static inline int tun_vnet_hdr_put(int sz, struct iov_iter *iter,
 	if (copy_to_iter(hdr, sizeof(*hdr), iter) != sizeof(*hdr))
 		return -EFAULT;
 
-	iov_iter_advance(iter, sz - sizeof(*hdr));
+	if (iov_iter_zero(sz - sizeof(*hdr), iter) != sz - sizeof(*hdr))
+		return -EFAULT;
 
 	return 0;
 }

-- 
2.46.2


  parent reply	other threads:[~2024-10-08  6:55 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-08  6:54 [PATCH RFC v5 00/10] tun: Introduce virtio-net hashing feature Akihiko Odaki
2024-10-08  6:54 ` [PATCH RFC v5 01/10] virtio_net: Add functions for hashing Akihiko Odaki
2024-10-09 13:51   ` Willem de Bruijn
2024-10-12 10:42     ` Akihiko Odaki
2024-10-12 17:40       ` Willem de Bruijn
2024-10-08  6:54 ` [PATCH RFC v5 02/10] skbuff: Introduce SKB_EXT_TUN_VNET_HASH Akihiko Odaki
2024-10-08  6:54 ` [PATCH RFC v5 03/10] net: flow_dissector: Export flow_keys_dissector_symmetric Akihiko Odaki
2024-10-08  6:54 ` [PATCH RFC v5 04/10] tun: Unify vnet implementation Akihiko Odaki
2024-10-09 13:55   ` Willem de Bruijn
2024-10-12 10:57     ` Akihiko Odaki
2024-10-12 17:43       ` Willem de Bruijn
2024-10-08  6:54 ` Akihiko Odaki [this message]
2024-10-09  7:44   ` [PATCH RFC v5 05/10] tun: Pad virtio header with zero Jason Wang
2024-10-08  6:54 ` [PATCH RFC v5 06/10] tun: Introduce virtio-net hash reporting feature Akihiko Odaki
2024-10-09  8:05   ` Jason Wang
2024-10-12 10:13     ` Akihiko Odaki
2024-10-09 13:57   ` Willem de Bruijn
2024-10-08  6:54 ` [PATCH RFC v5 07/10] tun: Introduce virtio-net RSS Akihiko Odaki
2024-10-09  8:14   ` Jason Wang
2024-10-12 10:29     ` Akihiko Odaki
2024-10-18  8:15       ` Jason Wang
2024-10-08  6:54 ` [PATCH RFC v5 08/10] selftest: tun: Test vnet ioctls without device Akihiko Odaki
2024-10-08  6:54 ` [PATCH RFC v5 09/10] selftest: tun: Add tests for virtio-net hashing Akihiko Odaki
2024-10-08  6:54 ` [PATCH RFC v5 10/10] vhost/net: Support VIRTIO_NET_F_HASH_REPORT Akihiko Odaki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241008-rss-v5-5-f3cf68df005d@daynix.com \
    --to=akihiko.odaki@daynix.com \
    --cc=andrew@daynix.com \
    --cc=corbet@lwn.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=gur.stavi@huawei.com \
    --cc=jasowang@redhat.com \
    --cc=kuba@kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@kernel.org \
    --cc=stephen@networkplumber.org \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=willemdebruijn.kernel@gmail.com \
    --cc=xuanzhuo@linux.alibaba.com \
    --cc=yuri.benditovich@daynix.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).