bonding: fix ICMPv6 header handling when receiving IPv6 messages
Subsystems (3)
PATCH v4 1/1 bonding: fix ICMPv6 header handling when receiving IPv6 messages
Currently, we get icmp6hdr via function icmp6_hdr(), which needs the skb transport header to be set first. But there is no rule to ask driver set transport header before netif_receive_skb() and bond_handle_frame(). So we will not able to get correct icmp6hdr on some drivers.
Fix this by using skb_header_pointer to get the IPv6 and ICMPV6 headers.
---
v4: get the full ipv6+icmp6 hdr in case the skb is not lineared
v3: fix _hdr parameter warning reported by kernel test robot
v2: use skb_header_pointer() to get icmp6hdr as Jay suggested.
--- drivers/net/bonding/bond_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/bonding/bond_main.c +12 -5
@@ -3231,16 +3231,23 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave) {struct slave *curr_active_slave, *curr_arp_slave; -struct icmp6hdr *hdr =icmp6_hdr (skb);struct in6_addr *saddr, *daddr; +struct { +struct ipv6hdr ip6; +struct icmp6hdr icmp6; + } *combined, _combined;if (skb->pkt_type ==PACKET_OTHERHOST || - skb->pkt_type ==PACKET_LOOPBACK || - hdr->icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT ) + skb->pkt_type ==PACKET_LOOPBACK ) + goto out; + + combined =skb_header_pointer (skb,0 ,sizeof (_combined), &_combined); +if (!combined || combined->ip6.nexthdr !=NEXTHDR_ICMP || + combined->icmp6.icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT ) goto out; - saddr = &ipv6_hdr (skb)->saddr; - daddr = &ipv6_hdr (skb)->daddr; + saddr = &combined->ip6.saddr; + daddr = &combined->ip6.saddr; slave_dbg(bond->dev, slave->dev, "%s: %s/%d av %d sv %d sip %pI6c tip %pI6c\n", __func__, slave->dev->name, bond_slave_state(slave),
Signature · 1 line
2.38.1
Quoted 6 lines · Hangbin Liu
Currently, we get icmp6hdr via function
icmp6_hdr(), which needs the skb transport header to be set first. But there is no rule to ask driver set transport header beforenetif_receive_skb()andbond_handle_frame(). So we will not able to get correct icmp6hdr on some drivers.
Quoted 7 lines
Fix this by using
skb_header_pointerto get the IPv6 and ICMPV6 headers.Reported-by Liang Li <[email protected]>Fixes 4e24be018eb9 ("bonding: add new parameter ns_targets")Suggested-by Eric Dumazet <[email protected]>Signed-off-by Hangbin Liu <[email protected]>---
Quoted 11 lines · Hangbin Liu
Currently, we get icmp6hdr via function
icmp6_hdr(), which needs the skb transport header to be set first. But there is no rule to ask driver set transport header beforenetif_receive_skb()andbond_handle_frame(). So we will not able to get correct icmp6hdr on some drivers.Fix this by using
skb_header_pointerto get the IPv6 and ICMPV6 headers.Reported-by Liang Li <[email protected]>Fixes 4e24be018eb9 ("bonding: add new parameter ns_targets")Suggested-by Eric Dumazet <[email protected]>Signed-off-by Hangbin Liu <[email protected]>
Quoted 44 lines
---
v4: get the full ipv6+icmp6 hdr in case the skb is not lineared
v3: fix_hdrparameter warning reported by kernel test robot
v2: useskb_header_pointer()to get icmp6hdr as Jay suggested.
---drivers/net/bonding/bond_main.c| 17 ++++++++++++-----1 file changed, 12 insertions(+), 5 deletions(-)drivers/net/bonding/bond_main.c +12
-5@@ -3231,16 +3231,23 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave) {struct slave *curr_active_slave, *curr_arp_slave; -struct icmp6hdr *hdr =icmp6_hdr (skb);struct in6_addr *saddr, *daddr; +struct { +struct ipv6hdr ip6; +struct icmp6hdr icmp6; + } *combined, _combined;if (skb->pkt_type ==PACKET_OTHERHOST || - skb->pkt_type ==PACKET_LOOPBACK || - hdr->icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT ) + skb->pkt_type ==PACKET_LOOPBACK ) + goto out; + + combined =skb_header_pointer (skb,0 ,sizeof (_combined), &_combined); +if (!combined || combined->ip6.nexthdr !=NEXTHDR_ICMP || + combined->icmp6.icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT ) goto out; - saddr = &ipv6_hdr (skb)->saddr; - daddr = &ipv6_hdr (skb)->daddr; + saddr = &combined->ip6.saddr; + daddr = &combined->ip6.saddr; slave_dbg(bond->dev, slave->dev, "%s: %s/%d av %d sv %d sip %pI6c tip %pI6c\n", __func__, slave->dev->name, bond_slave_state(slave),Signature · 1 line
2.38.1
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Fri, 18 Nov 2022 11:43:53 +0800 you wrote:
Currently, we get icmp6hdr via function
icmp6_hdr(), which needs the skb transport header to be set first. But there is no rule to ask driver set transport header beforenetif_receive_skb()andbond_handle_frame(). So we will not able to get correct icmp6hdr on some drivers.Fix this by using
skb_header_pointerto get the IPv6 and ICMPV6 headers.[...]
Here is the summary with links:
- [PATCHv4,net] bonding: fix ICMPv6 header handling when receiving IPv6 messages
https://git.kernel.org/netdev/net/c/4d633d1b468b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html