| Message ID | 20240915-rss-v3-4-c630015db082@daynix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tun: Introduce virtio-net hashing feature | expand |
Akihiko Odaki wrote: > tap used to simply advance iov_iter when it needs to pad virtio header. > This leaves the garbage in the buffer as is and prevents telling if the > header is padded or contains some real data. > > In theory, a user of tap 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 tap. This description does not describe the need for this operation. The new extension seemingly requires these bytes to be cleared? Please make that explicit. > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > drivers/net/tap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/tap.c b/drivers/net/tap.c > index 77574f7a3bd4..ba044302ccc6 100644 > --- a/drivers/net/tap.c > +++ b/drivers/net/tap.c > @@ -813,7 +813,7 @@ static ssize_t tap_put_user(struct tap_queue *q, > sizeof(vnet_hdr)) > return -EFAULT; > > - iov_iter_advance(iter, vnet_hdr_len - sizeof(vnet_hdr)); > + iov_iter_zero(vnet_hdr_len - sizeof(vnet_hdr), iter); > } > total = vnet_hdr_len; > total += skb->len; > > -- > 2.46.0 >
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 77574f7a3bd4..ba044302ccc6 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -813,7 +813,7 @@ static ssize_t tap_put_user(struct tap_queue *q, sizeof(vnet_hdr)) return -EFAULT; - iov_iter_advance(iter, vnet_hdr_len - sizeof(vnet_hdr)); + iov_iter_zero(vnet_hdr_len - sizeof(vnet_hdr), iter); } total = vnet_hdr_len; total += skb->len;
tap used to simply advance iov_iter when it needs to pad virtio header. This leaves the garbage in the buffer as is and prevents telling if the header is padded or contains some real data. In theory, a user of tap 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 tap. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- drivers/net/tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)