]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fou: Remove IPPROTO_UDPLITE check in gue_err() and gue6_err().
authorKuniyuki Iwashima <kuniyu@google.com>
Mon, 16 Mar 2026 13:31:25 +0000 (13:31 +0000)
committerJakub Kicinski <kuba@kernel.org>
Tue, 17 Mar 2026 23:10:59 +0000 (16:10 -0700)
UDP-Lite has been removed, and its error handler is no
longer found in either inet_protos[IPPROTO_UDPLITE] or
inet6_protos[IPPROTO_UDPLITE].

The recursion fixed by the protocol check in gue_err()
and gue6_err() no longer occurs with UDP-Lite.

Let's remove the checks.

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Joe Damato <joe@dama.to>
Link: https://patch.msgid.link/20260316133127.2646421-1-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/fou_core.c
net/ipv6/fou6.c

index 3baaa4df7e426d0f4867a4d4b8e635638f71e129..5bae3cf7fe7697c13a3e730cdb555152474832b6 100644 (file)
@@ -1150,8 +1150,7 @@ static int gue_err(struct sk_buff *skb, u32 info)
         * recursion. Besides, this kind of encapsulation can't even be
         * configured currently. Discard this.
         */
-       if (guehdr->proto_ctype == IPPROTO_UDP ||
-           guehdr->proto_ctype == IPPROTO_UDPLITE)
+       if (guehdr->proto_ctype == IPPROTO_UDP)
                return -EOPNOTSUPP;
 
        skb_set_transport_header(skb, -(int)sizeof(struct icmphdr));
index 430518ae26fa1e23f8beb7a61023ceaac9bb8b4e..157765259e2f5f25ba2dd800bed4da56f4d02248 100644 (file)
@@ -141,8 +141,7 @@ static int gue6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         * recursion. Besides, this kind of encapsulation can't even be
         * configured currently. Discard this.
         */
-       if (guehdr->proto_ctype == IPPROTO_UDP ||
-           guehdr->proto_ctype == IPPROTO_UDPLITE)
+       if (guehdr->proto_ctype == IPPROTO_UDP)
                return -EOPNOTSUPP;
 
        skb_set_transport_header(skb, -(int)sizeof(struct icmp6hdr));