Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

esp: check the NETIF_F_HW_ESP_TX_CSUM bit before segmenting

If I understand correctly, we should not be asking for a
checksum offload on an ipsec packet if the netdev isn't
advertising NETIF_F_HW_ESP_TX_CSUM.  In that case, we should
clear the NETIF_F_CSUM_MASK bits.

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Shannon Nelson 7 years ago
parent
f8c3d0dda4
commit
5211fcfb81
2 changed files with 4 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      net/ipv4/esp4_offload.c
  2. 2 0
      net/ipv6/esp6_offload.c

+ 2 - 0
net/ipv4/esp4_offload.c
View File 

@@ -138,6 +138,8 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,
 
 	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||
 
 	    (x->xso.dev != skb->dev))
 
 		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);
 
+	else if (!(features & NETIF_F_HW_ESP_TX_CSUM))
 
+		esp_features = features & ~NETIF_F_CSUM_MASK;
 
 
 	xo->flags |= XFRM_GSO_SEGMENT;

+ 2 - 0
net/ipv6/esp6_offload.c
View File 

@@ -165,6 +165,8 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,
 
 	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||
 
 	    (x->xso.dev != skb->dev))
 
 		esp_features = features & ~(NETIF_F_SG | NETIF_F_CSUM_MASK);
 
+	else if (!(features & NETIF_F_HW_ESP_TX_CSUM))
 
+		esp_features = features & ~NETIF_F_CSUM_MASK;
 
 
 	xo->flags |= XFRM_GSO_SEGMENT;