| Message ID | 20231008052917.145245-2-akihiko.odaki@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] tap: Fix virtio-net header buffer size | expand |
On Sun, Oct 08, 2023 at 02:29:10PM +0900, Akihiko Odaki wrote: > The largest possible virtio-net header is struct virtio_net_hdr_v1_hash. > > Fixes: fbbdbddec0 ("tap: allow extended virtio header with hash info") > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> This thread is malformed BTW: cover letter seems to be missing on list. > --- > net/tap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/tap.c b/net/tap.c > index c6639d9f20..ea46feeaa8 100644 > --- a/net/tap.c > +++ b/net/tap.c > @@ -118,7 +118,7 @@ static ssize_t tap_receive_iov(NetClientState *nc, const struct iovec *iov, > TAPState *s = DO_UPCAST(TAPState, nc, nc); > const struct iovec *iovp = iov; > struct iovec iov_copy[iovcnt + 1]; > - struct virtio_net_hdr_mrg_rxbuf hdr = { }; > + struct virtio_net_hdr_v1_hash hdr = { }; > > if (s->host_vnet_hdr_len && !s->using_vnet_hdr) { > iov_copy[0].iov_base = &hdr; > @@ -136,7 +136,7 @@ static ssize_t tap_receive_raw(NetClientState *nc, const uint8_t *buf, size_t si > TAPState *s = DO_UPCAST(TAPState, nc, nc); > struct iovec iov[2]; > int iovcnt = 0; > - struct virtio_net_hdr_mrg_rxbuf hdr = { }; > + struct virtio_net_hdr_v1_hash hdr = { }; > > if (s->host_vnet_hdr_len) { > iov[iovcnt].iov_base = &hdr; > -- > 2.42.0 > >
diff --git a/net/tap.c b/net/tap.c index c6639d9f20..ea46feeaa8 100644 --- a/net/tap.c +++ b/net/tap.c @@ -118,7 +118,7 @@ static ssize_t tap_receive_iov(NetClientState *nc, const struct iovec *iov, TAPState *s = DO_UPCAST(TAPState, nc, nc); const struct iovec *iovp = iov; struct iovec iov_copy[iovcnt + 1]; - struct virtio_net_hdr_mrg_rxbuf hdr = { }; + struct virtio_net_hdr_v1_hash hdr = { }; if (s->host_vnet_hdr_len && !s->using_vnet_hdr) { iov_copy[0].iov_base = &hdr; @@ -136,7 +136,7 @@ static ssize_t tap_receive_raw(NetClientState *nc, const uint8_t *buf, size_t si TAPState *s = DO_UPCAST(TAPState, nc, nc); struct iovec iov[2]; int iovcnt = 0; - struct virtio_net_hdr_mrg_rxbuf hdr = { }; + struct virtio_net_hdr_v1_hash hdr = { }; if (s->host_vnet_hdr_len) { iov[iovcnt].iov_base = &hdr;
The largest possible virtio-net header is struct virtio_net_hdr_v1_hash. Fixes: fbbdbddec0 ("tap: allow extended virtio header with hash info") Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- net/tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)