Linux Kernel Selftest development
 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,  devel@daynix.com,
	Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH v2 2/3] tun: Pad virtio header with zero
Date: Thu, 09 Jan 2025 15:58:44 +0900	[thread overview]
Message-ID: <20250109-tun-v2-2-388d7d5a287a@daynix.com> (raw)
In-Reply-To: <20250109-tun-v2-0-388d7d5a287a@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.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/tun_vnet.c b/drivers/net/tun_vnet.c
index fe842df9e9ef..ffb2186facd3 100644
--- a/drivers/net/tun_vnet.c
+++ b/drivers/net/tun_vnet.c
@@ -138,7 +138,8 @@ 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.47.1


  parent reply	other threads:[~2025-01-09  6:59 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09  6:58 [PATCH v2 0/3] tun: Unify vnet implementation and fill full vnet header Akihiko Odaki
2025-01-09  6:58 ` [PATCH v2 1/3] tun: Unify vnet implementation Akihiko Odaki
2025-01-09 14:06   ` Willem de Bruijn
2025-01-10  8:28     ` Akihiko Odaki
2025-01-10  3:24   ` Jason Wang
2025-01-09  6:58 ` Akihiko Odaki [this message]
2025-01-09  7:31   ` [PATCH v2 2/3] tun: Pad virtio header with zero Michael S. Tsirkin
2025-01-09  7:41     ` Akihiko Odaki
2025-01-09  7:43       ` Michael S. Tsirkin
2025-01-09  9:36         ` Akihiko Odaki
2025-01-09 10:37           ` Jan Kara
2025-01-09 12:46       ` Willem de Bruijn
2025-01-10  4:38         ` Akihiko Odaki
2025-01-10  8:33           ` Michael S. Tsirkin
2025-01-10 10:45             ` Akihiko Odaki
2025-01-10 11:32               ` Willem de Bruijn
2025-01-09  7:42     ` Michael S. Tsirkin
2025-01-10  3:27   ` Jason Wang
2025-01-10 10:25     ` Akihiko Odaki
2025-01-09  6:58 ` [PATCH v2 3/3] tun: Set num_buffers for virtio 1.0 Akihiko Odaki
2025-01-09  7:32   ` Michael S. Tsirkin
2025-01-09  7:40     ` Michael S. Tsirkin
2025-01-09  9:38       ` Akihiko Odaki
2025-01-09 10:54         ` Michael S. Tsirkin
2025-01-09 11:10           ` Akihiko Odaki
2025-01-10  3:27   ` Jason Wang
2025-01-10 10:04     ` Akihiko Odaki
2025-01-10 10:23     ` Michael S. Tsirkin
2025-01-10 11:12       ` Akihiko Odaki
2025-01-13  3:04         ` Jason Wang
2025-01-15  5:07           ` Akihiko Odaki
2025-01-16  1:06             ` Jason Wang
2025-01-16  5:30               ` Akihiko Odaki
2025-01-20  0:40                 ` Jason Wang
2025-01-20  4:57                   ` Akihiko Odaki
2025-01-09 13:46 ` [PATCH v2 0/3] tun: Unify vnet implementation and fill full vnet header Willem de Bruijn

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=20250109-tun-v2-2-388d7d5a287a@daynix.com \
    --to=akihiko.odaki@daynix.com \
    --cc=andrew@daynix.com \
    --cc=corbet@lwn.net \
    --cc=davem@davemloft.net \
    --cc=devel@daynix.com \
    --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