Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f92e03e authored by Ilan Tayari's avatar Ilan Tayari Committed by Steffen Klassert
Browse files

esp4/6: Fix GSO path for non-GSO SW-crypto packets 



If esp*_offload module is loaded, outbound packets take the
GSO code path, being encapsulated at layer 3, but encrypted
in layer 2. validate_xmit_xfrm calls esp*_xmit for that.

esp*_xmit was wrongfully detecting these packets as going
through hardware crypto offload, while in fact they should
be encrypted in software, causing plaintext leakage to
the network, and also dropping at the receiver side.

Perform the encryption in esp*_xmit, if the SA doesn't have
a hardware offload_handle.

Also, align esp6 code to esp4 logic.

Fixes: fca11ebd ("esp4: Reorganize esp_output")
Fixes: 383d0350 ("esp6: Reorganize esp_output")
Signed-off-by: default avatarIlan Tayari <ilant@mellanox.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent ffa6f571

net/ipv4/esp4_offload.c

+2 −2
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ 
	if (!xo)

		return -EINVAL;



	if (!(features & NETIF_F_HW_ESP) ||

	    (x->xso.offload_handle &&  x->xso.dev != skb->dev)) {

	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||

	    (x->xso.dev != skb->dev)) {

		xo->flags |= CRYPTO_FALLBACK;

		hw_offload = false;

	}

net/ipv6/esp6_offload.c

+4 −3
Original line number Diff line number Diff line
@@ -211,9 +211,10 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features 
	if (!xo)

		return -EINVAL;



	if (!(features & NETIF_F_HW_ESP) ||

	    (x->xso.offload_handle &&  x->xso.dev != skb->dev)) {

	if (!(features & NETIF_F_HW_ESP) || !x->xso.offload_handle ||

	    (x->xso.dev != skb->dev)) {

		xo->flags |= CRYPTO_FALLBACK;

		hw_offload = false;

	}



	esp.proto = xo->proto;
@@ -254,7 +255,7 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features 
		ipv6_hdr(skb)->payload_len = htons(len);

	}



	if (x->xso.offload_handle && !(xo->flags & CRYPTO_FALLBACK))

	if (hw_offload)

		return 0;



	esp.seqno = cpu_to_be64(xo->seq.low + ((u64)xo->seq.hi << 32));