Skip to content

[ciqlts8_6] ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach() #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 2 commits into from
Jun 11, 2026
+8 −0
Merged

[ciqlts8_6] ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach() #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0fd64f
ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach()
bmastbergen Jun 11, 2026
ab8e219
ip6_tunnel: clear skb2->cb[] in ip4ip6_err()
bmastbergen Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions net/ipv6/icmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,9 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,
if (!skb2)
return 1;

/* Remove debris left by IPv4 stack. */
memset(IP6CB(skb2), 0, sizeof(*IP6CB(skb2)));

skb_dst_drop(skb2);
skb_pull(skb2, nhs);
skb_reset_network_header(skb2);
Expand Down
5 changes: 5 additions & 0 deletions net/ipv6/ip6_tunnel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,16 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (!skb2)
return 0;

/* Remove debris left by IPv6 stack. */
memset(IPCB(skb2), 0, sizeof(*IPCB(skb2)));

skb_dst_drop(skb2);

skb_pull(skb2, offset);
skb_reset_network_header(skb2);
eiph = ip_hdr(skb2);
if (eiph->version != 4 || eiph->ihl < 5)
goto out;

/* Try to guess incoming interface */
rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, eiph->saddr,
Expand Down
Loading