net: Clear the dst when performing encap / decap

Commit ba9db6f907ac ("net: clear the dst when changing skb protocol")
added dst clearing when a BPF program changes the skb protocol
(e.g. IPv4 to IPv6). Since that was a fix we only cleared the dst when
the L3 protocol actually changes to keep it minimal. As suggested during
the discussion (see Link) encap or decap operation which wraps or unwraps
a same-protocol header may also render the existing dst incorrect - even
if that doesn't result in a crash, just the wrong route for the now-outermost
IP dst.

Make dropping dst unconditional for bpf_skb_change_proto() and all
L3 encap / decap ops.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/CANP3RGfRaYwve_xgxH6Tp2zenzKn2-DjZ9tg023WVzfdJF3p_w@mail.gmail.com
Link: https://patch.msgid.link/20260329180428.2657785-1-kuba@kernel.org

diff --git a/net/core/filter.c b/net/core/filter.c
index d55525cc5540817a46bccb1e6883c55d81194742..cf2113af4bc9ae7c976d7c55f3092643e1d875b6 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -3256,13 +3256,6 @@ static const struct bpf_func_proto bpf_skb_vlan_pop_proto = {
        .arg1_type      = ARG_PTR_TO_CTX,
 };
 
-static void bpf_skb_change_protocol(struct sk_buff *skb, u16 proto)
-{
-       skb->protocol = htons(proto);
-       if (skb_valid_dst(skb))
-               skb_dst_drop(skb);
-}
-
 static int bpf_skb_generic_push(struct sk_buff *skb, u32 off, u32 len)
 {
        /* Caller already did skb_cow() with meta_len+len as headroom,
@@ -3361,7 +3354,7 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb)
                shinfo->gso_type |=  SKB_GSO_DODGY;
        }
 
-       bpf_skb_change_protocol(skb, ETH_P_IPV6);
+       skb->protocol = htons(ETH_P_IPV6);
        skb_clear_hash(skb);
 
        return 0;
@@ -3392,7 +3385,7 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)
                shinfo->gso_type |=  SKB_GSO_DODGY;
        }
 
-       bpf_skb_change_protocol(skb, ETH_P_IP);
+       skb->protocol = htons(ETH_P_IP);
        skb_clear_hash(skb);
 
        return 0;
@@ -3440,7 +3433,13 @@ BPF_CALL_3(bpf_skb_change_proto, struct sk_buff *, skb, __be16, proto,
         */
        ret = bpf_skb_proto_xlat(skb, proto);
        bpf_compute_data_pointers(skb);
-       return ret;
+       if (ret)
+               return ret;
+
+       if (skb_valid_dst(skb))
+               skb_dst_drop(skb);
+
+       return 0;
 }
 
 static const struct bpf_func_proto bpf_skb_change_proto_proto = {
@@ -3582,12 +3581,13 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff,
                }
 
                /* Match skb->protocol to new outer l3 protocol */
-               if (skb->protocol == htons(ETH_P_IP) &&
-                   flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)
-                       bpf_skb_change_protocol(skb, ETH_P_IPV6);
-               else if (skb->protocol == htons(ETH_P_IPV6) &&
-                        flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV4)
-                       bpf_skb_change_protocol(skb, ETH_P_IP);
+               if (flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV6)
+                       skb->protocol = htons(ETH_P_IPV6);
+               else if (flags & BPF_F_ADJ_ROOM_ENCAP_L3_IPV4)
+                       skb->protocol = htons(ETH_P_IP);
+
+               if (skb_valid_dst(skb))
+                       skb_dst_drop(skb);
        }
 
        if (skb_is_gso(skb)) {
@@ -3615,6 +3615,7 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff,
 static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff,
                              u64 flags)
 {
+       bool decap = flags & BPF_F_ADJ_ROOM_DECAP_L3_MASK;
        int ret;
 
        if (unlikely(flags & ~(BPF_F_ADJ_ROOM_FIXED_GSO |
@@ -3637,13 +3638,16 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff,
        if (unlikely(ret < 0))
                return ret;
 
-       /* Match skb->protocol to new outer l3 protocol */
-       if (skb->protocol == htons(ETH_P_IP) &&
-           flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV6)
-               bpf_skb_change_protocol(skb, ETH_P_IPV6);
-       else if (skb->protocol == htons(ETH_P_IPV6) &&
-                flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV4)
-               bpf_skb_change_protocol(skb, ETH_P_IP);
+       if (decap) {
+               /* Match skb->protocol to new outer l3 protocol */
+               if (flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV6)
+                       skb->protocol = htons(ETH_P_IPV6);
+               else if (flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV4)
+                       skb->protocol = htons(ETH_P_IP);
+
+               if (skb_valid_dst(skb))
+                       skb_dst_drop(skb);
+       }
 
        if (skb_is_gso(skb)) {
                struct skb_shared_info *shinfo = skb_shinfo(skb);