Skip to contentSkip to conversation

vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit

PATCH Applied Stephen Suryaputra 4 participants 4 messages Nov 30, 2021 – Dec 2, 2021

Subsystems (4)
Networking Network drivers Stable branch VRF
lore
Share & tools
lore

Stephen Suryaputra

author
#0 lore raw

PATCH 1/1 vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit

IPCB/IP6CB need to be initialized when processing outbound v4 or v6 pkts in the codepath of vrf device xmit function so that leftover garbage doesn't cause futher code that uses the CB to incorrectly process the pkt.

One occasion of the issue might occur when MPLS route uses the vrf device as the outgoing device such as when the route is added using "ip -f mpls route add <label> dev <vrf>" command.

The problems seems to exist since day one. Hence I put the day one commits on the Fixes tags.

Fixes 193125dbd8eb ("net: Introduce VRF device driver")
Fixes 35402e313663 ("net: Add IPv6 support to VRF device")
Signed-off-by Stephen Suryaputra <[email protected]>
---
 drivers/net/vrf.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/vrf.c +2 -0
index ccf677015d5b..131c745dc701 100644
@@ -497,6 +497,7 @@ static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb,
 	/* strip the ethernet header added for pass through VRF device */
 	__skb_pull(skb, skb_network_offset(skb));
 
+	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
 	ret = vrf_ip6_local_out(net, skb->sk, skb);
 	if (unlikely(net_xmit_eval(ret)))
 		dev->stats.tx_errors++;

@@ -579,6 +580,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
 					       RT_SCOPE_LINK);
 	}
 
+	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
 	ret = vrf_ip_local_out(dev_net(skb_dst(skb)->dev), skb->sk, skb);
 	if (unlikely(net_xmit_eval(ret)))
 		vrf_dev->stats.tx_errors++;
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Stephen Suryaputra

IPCB/IP6CB need to be initialized when processing outbound v4 or v6 pkts in the codepath of vrf device xmit function so that leftover garbage doesn't cause futher code that uses the CB to incorrectly process the pkt.

One occasion of the issue might occur when MPLS route uses the vrf device as the outgoing device such as when the route is added using "ip -f mpls route add <label> dev <vrf>" command.

The problems seems to exist since day one. Hence I put the day one commits on the Fixes tags.

Quoted 7 lines
Fixes 193125dbd8eb ("net: Introduce VRF device driver")
Fixes 35402e313663 ("net: Add IPv6 support to VRF device")
Signed-off-by Stephen Suryaputra <[email protected]>
---
 drivers/net/vrf.c | 2 ++
 1 file changed, 2 insertions(+)
Reviewed-by David Ahern <[email protected]>
#2 lore raw
In reply to Stephen Suryaputra

Le 30/11/2021 à 17:26, Stephen Suryaputra a écrit :

Quoted 9 lines

IPCB/IP6CB need to be initialized when processing outbound v4 or v6 pkts in the codepath of vrf device xmit function so that leftover garbage doesn't cause futher code that uses the CB to incorrectly process the pkt.

One occasion of the issue might occur when MPLS route uses the vrf device as the outgoing device such as when the route is added using "ip -f mpls route add <label> dev <vrf>" command.

Quoted 6 lines

The problems seems to exist since day one. Hence I put the day one commits on the Fixes tags.

Fixes 193125dbd8eb ("net: Introduce VRF device driver")
Fixes 35402e313663 ("net: Add IPv6 support to VRF device")
Signed-off-by Stephen Suryaputra <[email protected]>
Cc [email protected]

Thanks,
Nicolas

CI Applied
#3 lore raw
In reply to Stephen Suryaputra
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 10 lines · On Tue, 30 Nov 2021 11:26:37 -0500 you wrote:

IPCB/IP6CB need to be initialized when processing outbound v4 or v6 pkts in the codepath of vrf device xmit function so that leftover garbage doesn't cause futher code that uses the CB to incorrectly process the pkt.

One occasion of the issue might occur when MPLS route uses the vrf device as the outgoing device such as when the route is added using "ip -f mpls route add <label> dev <vrf>" command.

[...]

Here is the summary with links:
- [net] vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit

    https://git.kernel.org/netdev/net/c/ee201011c1e1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html