net: ipv4: fix stat increase when udp early demux drops the packet
Subsystems (3)
PATCH v2 1/1 net: ipv4: fix stat increase when udp early demux drops the packet
udp_v4_early_demux now returns drop reasons as it either returns 0 or ip_mc_validate_source, which returns itself a drop reason. However its use was not converted in ip_rcv_finish_core and the drop reason is ignored, leading to potentially skipping increasing LINUX_MIB_IPRPFILTER if the drop reason is SKB_DROP_REASON_IP_RPFILTER.
This is a fix and we're not converting udp_v4_early_demux to explicitly return a drop reason to ease backports; this can be done as a follow-up.
---
Changes in v2:
- Reset the drop reason to NOT_SPECIFIED if not returning early. The diff remains small and this aligns with the rest of the function.
--- net/ipv4/ip_input.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/ipv4/ip_input.c +4 -3
@@ -319,8 +319,8 @@ static int ip_rcv_finish_core(struct net *net, const struct sk_buff *hint) {const struct iphdr *iph =ip_hdr (skb); -int err, drop_reason;struct rtable *rt; +int drop_reason;if (ip_can_use_hint (skb, iph, hint)) { drop_reason = ip_route_use_hint(skb, iph->daddr, iph->saddr,
@@ -345,9 +345,10 @@ static int ip_rcv_finish_core(struct net *net,break ;case IPPROTO_UDP :if (READ_ONCE (net->ipv4.sysctl_udp_early_demux)) { - err =udp_v4_early_demux (skb); -if (unlikely (err)) + drop_reason =udp_v4_early_demux (skb); +if (unlikely (drop_reason)) goto drop_error; + drop_reason =SKB_DROP_REASON_NOT_SPECIFIED ;/* must reload iph, skb->head might have changed */ iph =ip_hdr (skb);
Signature · 1 line
2.50.0
Quoted 13 lines · Antoine Tenart
udp_v4_early_demuxnow returns drop reasons as it either returns 0 orip_mc_validate_source, which returns itself a drop reason. However its use was not converted inip_rcv_finish_coreand the drop reason is ignored, leading to potentially skipping increasingLINUX_MIB_IPRPFILTERif the drop reason isSKB_DROP_REASON_IP_RPFILTER.This is a fix and we're not converting
udp_v4_early_demuxto explicitly return a drop reason to ease backports; this can be done as a follow-up.Fixes d46f827016d8 ("net: ip: make ip_mc_validate_source() return drop reason")Cc Menglong Dong <[email protected]>Reported-by Sabrina Dubroca <[email protected]>Signed-off-by Antoine Tenart <[email protected]>
Quoted 7 lines
---
Changes in v2:
- Reset the drop reason toNOT_SPECIFIEDif not returning early. The diff remains small and this aligns with the rest of the function.--- net/ipv4/ip_input.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Thanks Antoine.
Signature · 1 line
Sabrina
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 10 lines · On Tue, 1 Jul 2025 09:49:34 +0200 you wrote:
udp_v4_early_demuxnow returns drop reasons as it either returns 0 orip_mc_validate_source, which returns itself a drop reason. However its use was not converted inip_rcv_finish_coreand the drop reason is ignored, leading to potentially skipping increasingLINUX_MIB_IPRPFILTERif the drop reason isSKB_DROP_REASON_IP_RPFILTER.This is a fix and we're not converting
udp_v4_early_demuxto explicitly return a drop reason to ease backports; this can be done as a follow-up.[...]
Here is the summary with links:
- [net,v2] net: ipv4: fix stat increase when udp early demux drops the packet
https://git.kernel.org/netdev/net/c/c2a2ff6b4db5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html