ipvlan: fix bound dev checking for IPv6 l3s mode
Subsystems (2)
PATCH v2 1/1 ipvlan: fix bound dev checking for IPv6 l3s mode
The commit 59a0b022aa24 ("ipvlan: Make skb->skb_iif track skb->dev for l3s mode") fixed ipvlan bonded dev checking by updating skb skb_iif. This fix works for IPv4, as in raw_v4_input() the dif is from inet_iif(skb), which is skb->skb_iif when there is no route.
But for IPv6, the fix is not enough, because in ipv6_raw_deliver() -> raw_v6_match(), the dif is inet6_iif(skb), which is returns IP6CB(skb)->iif instead of skb->skb_iif if it's not a l3_slave. To fix the IPv6 part issue. Let's set IP6CB(skb)->iif to correct ifindex.
BTW, ipvlan handles NS/NA specifically. Since it works fine, I will not reset IP6CB(skb)->iif when addr->atype is IPVL_ICMPV6.
---
v2: set IP6CB(skb)->iif instead of setting IP6SKB_L3SLAVE flag
--- drivers/net/ipvlan/ipvlan_l3s.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ipvlan/ipvlan_l3s.c +4 -0
@@ -102,6 +102,10 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, skb->dev = addr->master->dev; skb->skb_iif = skb->dev->ifindex; +#if IS_ENABLED (CONFIG_IPV6 ) +if (addr->atype ==IPVL_IPV6 ) +IP6CB (skb)->iif = skb->dev->ifindex; +#endif len = skb->len +ETH_HLEN ;ipvlan_count_rx (addr->master, len, true, false); out:
Signature · 1 line
2.38.1
Quoted 10 lines · Hangbin Liu
The commit
59a0b022aa24("ipvlan: Makeskb->skb_iiftrackskb->devfor l3s mode") fixed ipvlan bonded dev checking by updating skbskb_iif. This fix works for IPv4, as inraw_v4_input()the dif is frominet_iif(skb), which isskb->skb_iifwhen there is no route.But for IPv6, the fix is not enough, because in
ipv6_raw_deliver()->raw_v6_match(), the dif isinet6_iif(skb), which is returns IP6CB(skb)->iif instead ofskb->skb_iifif it's not al3_slave. To fix the IPv6 part issue. Let's set IP6CB(skb)->iif to correct ifindex.
Quoted 6 lines
BTW, ipvlan handles NS/NA specifically. Since it works fine, I will not reset IP6CB(skb)->iif when
addr->atypeisIPVL_ICMPV6.Fixes c675e06a98a4 ("ipvlan: decouple l3s mode dependencies from other modes")Signed-off-by Hangbin Liu <[email protected]>
Despite broken prefix, unlike v1, this fix looks good.
Quoted 25 lines
---
v2: set IP6CB(skb)->iif instead of settingIP6SKB_L3SLAVEflag--- drivers/net/ipvlan/ipvlan_l3s.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/net/ipvlan/ipvlan_l3s.c +4
-0@@ -102,6 +102,10 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, skb->dev = addr->master->dev; skb->skb_iif = skb->dev->ifindex; +#if IS_ENABLED (CONFIG_IPV6 ) +if (addr->atype ==IPVL_IPV6 ) +IP6CB (skb)->iif = skb->dev->ifindex; +#endif len = skb->len +ETH_HLEN ;ipvlan_count_rx (addr->master, len, true, false); out:Signature · 1 line
2.38.1
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 11 lines · On Fri, 9 Jun 2023 17:15:02 +0800 you wrote:
The commit
59a0b022aa24("ipvlan: Makeskb->skb_iiftrackskb->devfor l3s mode") fixed ipvlan bonded dev checking by updating skbskb_iif. This fix works for IPv4, as inraw_v4_input()the dif is frominet_iif(skb), which isskb->skb_iifwhen there is no route.But for IPv6, the fix is not enough, because in
ipv6_raw_deliver()->raw_v6_match(), the dif isinet6_iif(skb), which is returns IP6CB(skb)->iif instead ofskb->skb_iifif it's not al3_slave. To fix the IPv6 part issue. Let's set IP6CB(skb)->iif to correct ifindex.[...]
Here is the summary with links:
- [PATCHv2,net] ipvlan: fix bound dev checking for IPv6 l3s mode
https://git.kernel.org/netdev/net/c/ce57adc222ab
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html