xfrm: Linearize the skb after offloading if needed.
Subsystems (3)
PATCH 1/1 xfrm: Linearize the skb after offloading if needed.
With offloading enabled, esp_xmit() gets invoked very late, from within validate_xmit_xfrm() which is after validate_xmit_skb() validates and linearizes the skb if the underlying device does not support fragments.
esp_output_tail() may add a fragment to the skb while adding the auth tag/ IV. Devices without the proper support will then send skb->data points to with the correct length so the packet will have garbage at the end. A pcap sniffer will claim that the proper data has been sent since it parses the skb properly.
It is not affected with INET_ESP_OFFLOAD disabled.
Linearize the skb after offloading if the sending hardware requires it. It was tested on v4, v6 has been adopted.
--- net/ipv4/esp4_offload.c | 3 +++ net/ipv6/esp6_offload.c | 3 +++ 2 files changed, 6 insertions(+)
net/ipv4/esp4_offload.c +3 -0
@@ -340,6 +340,9 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_secpath_reset (skb); +if (skb_needs_linearize (skb, skb->dev->features) && +__skb_linearize (skb)) +return -ENOMEM ;return 0 ; }
net/ipv6/esp6_offload.c +3 -0
@@ -374,6 +374,9 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_featuressecpath_reset (skb); +if (skb_needs_linearize (skb, skb->dev->features) && +__skb_linearize (skb)) +return -ENOMEM ;return 0 ; }
Signature · 1 line
2.40.1
Quoted 10 lines · Sebastian Andrzej Siewior
With offloading enabled,
esp_xmit()gets invoked very late, from withinvalidate_xmit_xfrm()which is aftervalidate_xmit_skb()validates and linearizes the skb if the underlying device does not support fragments.
esp_output_tail()may add a fragment to the skb while adding the auth tag/ IV. Devices without the proper support will then sendskb->datapoints to with the correct length so the packet will have garbage at the end. A pcap sniffer will claim that the proper data has been sent since it parses the skb properly.
Quoted 7 lines
It is not affected with
INET_ESP_OFFLOADdisabled.Linearize the skb after offloading if the sending hardware requires it. It was tested on v4, v6 has been adopted.
Fixes 7785bba299a8d ("esp: Add a software GRO codepath")Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Applied to the ipsec tree, thanks a lot!