diff options
| author | Willem de Bruijn <willemb@google.com> | 2021-12-20 09:50:27 -0500 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-20 18:47:37 -0800 |
| commit | 1ed1d592113959f00cc552c3b9f47ca2d157768f (patch) | |
| tree | 38c8f57fc5231b57a47b0b0b5f98327f244d89d9 /include | |
| parent | 7e5cced9ca84df52d874aca6b632f930b3dc5bc6 (diff) | |
| download | linux-stable-1ed1d592113959f00cc552c3b9f47ca2d157768f.tar.gz linux-stable-1ed1d592113959f00cc552c3b9f47ca2d157768f.tar.bz2 linux-stable-1ed1d592113959f00cc552c3b9f47ca2d157768f.zip | |
net: skip virtio_net_hdr_set_proto if protocol already set
virtio_net_hdr_set_proto infers skb->protocol from the virtio_net_hdr
gso_type, to avoid packets getting dropped for lack of a proto type.
Its protocol choice is a guess, especially in the case of UFO, where
the single VIRTIO_NET_HDR_GSO_UDP label covers both UFOv4 and UFOv6.
Skip this best effort if the field is already initialized. Whether
explicitly from userspace, or implicitly based on an earlier call to
dev_parse_header_protocol (which is more robust, but was introduced
after this patch).
Fixes: 9d2f67e43b73 ("net/packet: fix packet drop as of virtio gso")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20211220145027.2784293-1-willemdebruijn.kernel@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/virtio_net.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 22dd48c82560..a960de68ac69 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -25,6 +25,9 @@ static inline bool virtio_net_hdr_match_proto(__be16 protocol, __u8 gso_type) static inline int virtio_net_hdr_set_proto(struct sk_buff *skb, const struct virtio_net_hdr *hdr) { + if (skb->protocol) + return 0; + switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) { case VIRTIO_NET_HDR_GSO_TCPV4: case VIRTIO_NET_HDR_GSO_UDP: |