geneve: ensure the skb is writable before fixing its headers
Subsystems (2)
PATCH 1/1 geneve: ensure the skb is writable before fixing its headers
Make sure the IPv4/6 and UDP headers are writable before fixing them up in geneve_post_decap_hint. As skb_ensure_writable can reallocate the skb linear area, reload the GRO hint header pointer and only set the IPv4/6 header ones after the call.
--- drivers/net/geneve.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/geneve.c +11 -2
@@ -586,6 +586,7 @@ static int geneve_post_decap_hint(const struct sock *sk, struct sk_buff *skb,struct iphdr *iph;struct udphdr *uh;__be16 p; +int err; hint_off =geneve_sk_gro_hint_off (sk, *geneveh, &p, &len);if (!hint_off)
@@ -610,12 +611,20 @@ static int geneve_post_decap_hint(const struct sock *sk, struct sk_buff *skb, !geneve_opt_gro_hint_validate(skb->data, gro_hint)))return -EINVAL ; - ipv6h = (void *)skb->data + gro_hint->nested_nh_offset; - iph = (struct iphdr *)ipv6h; total_len = skb->len - gro_hint->nested_nh_offset;if (total_len >=GRO_LEGACY_MAX_SIZE )return -E2BIG ; + err =skb_ensure_writable (skb, gro_hint->nested_tp_offset +sizeof (*uh)); +if (unlikely (err)) +return err; + + *geneveh =geneve_hdr (skb); + gro_hint =geneve_opt_gro_hint (*geneveh, hint_off); + + ipv6h = (void *)skb->data + gro_hint->nested_nh_offset; + iph = (struct iphdr *)ipv6h; +/* * After stripping the outer encap, the packet still carries a * tunnel encapsulation: the nested one.
Signature · 1 line
2.55.0
Quoted 10 lines · Antoine Tenart
Make sure the IPv4/6 and UDP headers are writable before fixing them up in
geneve_post_decap_hint. Asskb_ensure_writablecan reallocate the skb linear area, reload the GRO hint header pointer and only set the IPv4/6 header ones after the call.Fixes fd0dd796576e ("geneve: use GRO hint option in the RX path")Cc Paolo Abeni <[email protected]>Reported-by Sashiko <[email protected]>Signed-off-by Antoine Tenart <[email protected]>
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 5 lines · On Thu, 9 Jul 2026 14:50:00 +0200 you wrote:
Make sure the IPv4/6 and UDP headers are writable before fixing them up in
geneve_post_decap_hint. Asskb_ensure_writablecan reallocate the skb linear area, reload the GRO hint header pointer and only set the IPv4/6 header ones after the call.
Quoted 7 lines
Fixes fd0dd796576e ("geneve: use GRO hint option in the RX path")Cc Paolo Abeni <[email protected]>Reported-by Sashiko <[email protected]>Signed-off-by Antoine Tenart <[email protected]>[...]
Here is the summary with links:
- [net] geneve: ensure the skb is writable before fixing its headers
https://git.kernel.org/netdev/net/c/447ec540233c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html