net: no longer reset transport_header in __netif_receive_skb_core()
Subsystems (2)
PATCH 1/1 net: no longer reset transport_header in __netif_receive_skb_core()
In commit 66e4c8d95008 ("net: warn if transport header was not set") I added a debug check in skb_transport_header() to detect if a caller expects the transport_header to be set to a meaningful value by a prior code path.
Unfortunately, __netif_receive_skb_core() resets the transport header to the same value than the network header, defeating this check in receive paths.
Pretending the transport and network headers are the same is usually wrong.
This patch removes this reset for CONFIG_DEBUG_NET=y builds to let fuzzers and CI find bugs.
--- net/core/dev.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/core/dev.c +6 -0
@@ -5476,8 +5476,14 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, orig_dev = skb->dev;skb_reset_network_header (skb); +#if !defined(CONFIG_DEBUG_NET ) +/* We plan to no longer reset the transport header here. +* Give some time to fuzzers and dev build to catch bugs +* in network stacks. +*/ if (!skb_transport_header_was_set (skb))skb_reset_transport_header (skb); +#endif skb_reset_mac_len (skb); pt_prev =NULL ;
Signature · 1 line
2.47.1.613.gc27f4b7a9f-goog
Quoted 9 lines · Eric Dumazet
In commit
66e4c8d95008("net: warn if transport header was not set") I added a debug check inskb_transport_header()to detect if a caller expects thetransport_headerto be set to a meaningful value by a prior code path.Unfortunately,
__netif_receive_skb_core()resets the transport header to the same value than the network header, defeating this check in receive paths.
Quoted 7 lines
Pretending the transport and network headers are the same is usually wrong.
This patch removes this reset for
CONFIG_DEBUG_NET=ybuilds to let fuzzers and CI find bugs.Signed-off-by Eric Dumazet <[email protected]>
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Tue, 7 Jan 2025 14:43:42 +0000 you wrote:
In commit
66e4c8d95008("net: warn if transport header was not set") I added a debug check inskb_transport_header()to detect if a caller expects thetransport_headerto be set to a meaningful value by a prior code path.Unfortunately,
__netif_receive_skb_core()resets the transport header to the same value than the network header, defeating this check in receive paths.[...]
Here is the summary with links:
- [net-next] net: no longer reset transport_header in __netif_receive_skb_core()
https://git.kernel.org/netdev/net-next/c/2170a1f09148
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html