diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2021-03-30 12:28:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-31 02:06:49 +0200 |
| commit | 78352f73dc5047f3f744764cc45912498c52f3c9 (patch) | |
| tree | 9b837e7ef006636b83b42fb98102429058003345 /net/ipv4/udp.c | |
| parent | udp: properly complete L4 GRO over UDP tunnel packet (diff) | |
| download | linux-78352f73dc5047f3f744764cc45912498c52f3c9.tar.xz linux-78352f73dc5047f3f744764cc45912498c52f3c9.zip | |
udp: never accept GSO_FRAGLIST packets
Currently the UDP protocol delivers GSO_FRAGLIST packets to
the sockets without the expected segmentation.
This change addresses the issue introducing and maintaining
a couple of new fields to explicitly accept SKB_GSO_UDP_L4
or GSO_FRAGLIST packets. Additionally updates udp_unexpected_gso()
accordingly.
UDP sockets enabling UDP_GRO stil keep accept_udp_fraglist
zeroed.
v1 -> v2:
- use 2 bits instead of a whole GSO bitmask (Willem)
Fixes: 9fd1ff5d2ac7 ("udp: Support UDP fraglist GRO/GSO.")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index fe85dcf8c008..c0695ce42dc5 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2666,9 +2666,12 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, case UDP_GRO: lock_sock(sk); + + /* when enabling GRO, accept the related GSO packet type */ if (valbool) udp_tunnel_encap_enable(sk->sk_socket); up->gro_enabled = valbool; + up->accept_udp_l4 = valbool; release_sock(sk); break; |