bpf_lwt_push_ip_encap() rebases the network header after prepending an IP header, but leaves IPCB(skb)->opt describing the inner IPv4 header. An ingress LWT route can consequently make an ICMP error use stale option offsets when constructing its reply.
Mark each completed LWT IP encapsulation in the run's BPF network context and reset the protocol control block after bpf_prog_run_save_cb() restores it. This also covers an skb which was already marked encapsulated before entering LWT. A failed SEG6 encapsulation does not set the marker, so it no longer causes valid IPv6 metadata to be cleared. Select the reset layout from the protocol callback which consumes the packet: the original family for BPF_OK and unsupported redirects, or the new family for supported reroute and redirect paths. Preserve the ingress interface and L3-slave state from the restored original control block and initialize the IPv6 next-header offset when needed. Save and restore the marker around nested LWT runs. Cc: [email protected] Fixes: 52f278774e79 ("bpf: implement BPF_LWT_ENCAP_IP mode in bpf_lwt_push_encap") Reported-by: Xiang Mei <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]/ Suggested-by: Daniel Borkmann <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]/ Assisted-by: LLM Signed-off-by: Weiming Shi <[email protected]> --- include/linux/filter.h | 1 + net/core/lwt_bpf.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/linux/filter.h b/include/linux/filter.h index 788c2d625db4a..c8ca526d0661d 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -848,6 +848,7 @@ struct bpf_nh_params { #define BPF_RI_F_CPU_MAP_INIT BIT(2) #define BPF_RI_F_DEV_MAP_INIT BIT(3) #define BPF_RI_F_XSK_MAP_INIT BIT(4) +#define BPF_RI_F_LWT_IP_ENCAP BIT(5) struct bpf_redirect_info { u64 tgt_index; diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c index da49364ec63de..d585484a3a766 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -36,10 +36,44 @@ static inline struct bpf_lwt *bpf_lwt_lwtunnel(struct lwtunnel_state *lwt) #define NO_REDIRECT false #define CAN_REDIRECT true +static void bpf_lwt_reset_cb(struct sk_buff *skb, __be16 orig_proto, + bool use_new_proto) +{ + __be16 cb_proto = use_new_proto ? skb->protocol : orig_proto; + int iif = skb->skb_iif; + bool l3slave = false; + + /* VRF may have replaced skb_iif with the master device index. */ + if (orig_proto == htons(ETH_P_IP)) { + iif = IPCB(skb)->iif; + l3slave = ipv4_l3mdev_skb(IPCB(skb)->flags); + } else if (orig_proto == htons(ETH_P_IPV6)) { + iif = IP6CB(skb)->iif; + l3slave = ipv6_l3mdev_skb(IP6CB(skb)->flags); + } + + if (cb_proto == htons(ETH_P_IP)) { + memset(IPCB(skb), 0, sizeof(*IPCB(skb))); + IPCB(skb)->iif = iif; + if (l3slave) + IPCB(skb)->flags |= IPSKB_L3SLAVE; + } else if (cb_proto == htons(ETH_P_IPV6)) { + memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); + IP6CB(skb)->iif = iif; + IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr); + if (l3slave) + IP6CB(skb)->flags |= IP6SKB_L3SLAVE; + } +} + static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt, struct dst_entry *dst, bool can_redirect) { struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx; + struct bpf_redirect_info *ri; + bool lwt_ip_encap, nested_lwt_ip_encap; + __be16 orig_proto = skb->protocol; + bool use_new_proto; int ret; /* Disabling BH is needed to protect per-CPU bpf_redirect_info between @@ -47,8 +81,20 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt, */ local_bh_disable(); bpf_net_ctx = bpf_net_ctx_set(&__bpf_net_ctx); + ri = bpf_net_ctx_get_ri(); + nested_lwt_ip_encap = ri->kern_flags & BPF_RI_F_LWT_IP_ENCAP; + ri->kern_flags &= ~BPF_RI_F_LWT_IP_ENCAP; bpf_compute_data_pointers(skb); ret = bpf_prog_run_save_cb(lwt->prog, skb); + lwt_ip_encap = ri->kern_flags & BPF_RI_F_LWT_IP_ENCAP; + ri->kern_flags &= ~BPF_RI_F_LWT_IP_ENCAP; + if (nested_lwt_ip_encap) + ri->kern_flags |= BPF_RI_F_LWT_IP_ENCAP; + use_new_proto = (ret == BPF_LWT_REROUTE && + lwt->prog->type != BPF_PROG_TYPE_LWT_OUT) || + (ret == BPF_REDIRECT && can_redirect); + if (lwt_ip_encap) + bpf_lwt_reset_cb(skb, orig_proto, use_new_proto); switch (ret) { case BPF_OK: @@ -668,6 +714,7 @@ int bpf_lwt_push_ip_encap(struct sk_buff *skb, void *hdr, u32 len, bool ingress) } else { skb->protocol = htons(ETH_P_IPV6); } + bpf_net_ctx_get_ri()->kern_flags |= BPF_RI_F_LWT_IP_ENCAP; if (skb_is_gso(skb)) return handle_gso_encap(skb, ipv4, len); -- 2.55.0
