ipip: fix skb leak in collect_md mode when metadata_dst allocation fails
Subsystems (4)
PATCH 1/1 ipip: fix skb leak in collect_md mode when metadata_dst allocation fails
In collect_md mode ipip_tunnel_rcv() returns 0 without freeing the skb when ip_tun_rx_dst() fails to allocate the metadata_dst. ipip_rcv() and mplsip_rcv() are registered as xfrm_tunnel handlers, so tunnel4_rcv() and tunnelmpls4_rcv() read the zero return as "the packet has been consumed" and do not free it either. The skb is leaked.
The other tunnel drivers all dispose of the packet at this point:ip6_tunnel.c jumps to its drop label, ip_gre.c and ip6_gre.c return PACKET_REJECT, which makes gre_rcv() free the skb. Only ipip returns 0.
Jump to the existing drop label instead. It frees the skb and still returns 0, so the packet keeps being reported as consumed, which is what we want here: the outer header has already been pulled, and neither the remaining handlers nor an ICMP unreachable have any use for it.
Triggering this needs an ipip or mplsip tunnel in collect_md mode and an atomic allocation failure, which is why it has gone unnoticed.
--- net/ipv4/ipip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ipip.c +1 -1
@@ -248,7 +248,7 @@ static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto) tun_dst =ip_tun_rx_dst (skb, flags,0 ,0 );if (!tun_dst) -return 0 ; + goto drop;ip_tunnel_md_udp_encap (skb, &tun_dst->u.tun_info); }skb_reset_mac_header (skb);
Signature · 1 line
2.47.3
Quoted 31 lines · Anton Danilov
In
collect_mdmodeipip_tunnel_rcv()returns 0 without freeing the skb whenip_tun_rx_dst()fails to allocate themetadata_dst.ipip_rcv()andmplsip_rcv()are registered asxfrm_tunnelhandlers, sotunnel4_rcv()andtunnelmpls4_rcv()read the zero return as "the packet has been consumed" and do not free it either. The skb is leaked.The other tunnel drivers all dispose of the packet at this point:
ip6_tunnel.cjumps to its drop label,ip_gre.candip6_gre.creturnPACKET_REJECT, which makesgre_rcv()free the skb. Only ipip returns 0.Jump to the existing drop label instead. It frees the skb and still returns 0, so the packet keeps being reported as consumed, which is what we want here: the outer header has already been pulled, and neither the remaining handlers nor an ICMP unreachable have any use for it.
Triggering this needs an ipip or mplsip tunnel in
collect_mdmode and an atomic allocation failure, which is why it has gone unnoticed.Fixes cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")Assisted-by Claude-Code:claude-opus-5Signed-off-by Anton Danilov <[email protected]>--- net/ipv4/ipip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv4/ipip.c +0
-0
net/ipv4/ipip.c static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto) · line 254
Quoted 8 lines
net/ipv4/ipip.c +1
-1@@ -248,7 +248,7 @@ static int ipip_tunnel_rcv(struct sk_buff *skb, u8 ipproto) tun_dst =ip_tun_rx_dst (skb, flags,0 ,0 );if (!tun_dst) -return 0 ; + goto drop;ip_tunnel_md_udp_encap (skb, &tun_dst->u.tun_info); }skb_reset_mac_header (skb);
Thanks!
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Wed, 19 Aug 2026 13:43:39 +0300 you wrote:
In
collect_mdmodeipip_tunnel_rcv()returns 0 without freeing the skb whenip_tun_rx_dst()fails to allocate themetadata_dst.ipip_rcv()andmplsip_rcv()are registered asxfrm_tunnelhandlers, sotunnel4_rcv()andtunnelmpls4_rcv()read the zero return as "the packet has been consumed" and do not free it either. The skb is leaked.The other tunnel drivers all dispose of the packet at this point:
ip6_tunnel.cjumps to its drop label,ip_gre.candip6_gre.creturnPACKET_REJECT, which makesgre_rcv()free the skb. Only ipip returns 0.[...]
Here is the summary with links:
- [net] ipip: fix skb leak in collect_md mode when metadata_dst allocation fails
https://git.kernel.org/netdev/net/c/6776efe4a52f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html