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

Commit b26f4892 authored by Steffen Klassert's avatar Steffen Klassert Committed by Greg Kroah-Hartman
Browse files

ixgbe: Fix secpath usage for IPsec TX offload. 



[ Upstream commit f39b683d35dfa93a58f1b400a8ec0ff81296b37c ]

The ixgbe driver currently does IPsec TX offloading
based on an existing secpath. However, the secpath
can also come from the RX side, in this case it is
misinterpreted for TX offload and the packets are
dropped with a "bad sa_idx" error. Fix this by using
the xfrm_offload() function to test for TX offload.

Fixes: 59259470 ("ixgbe: process the Tx ipsec offload")
Reported-by: default avatarMichael Marley <michael@michaelmarley.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2354e925

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <net/tc_act/tc_mirred.h>

#include <net/vxlan.h>

#include <net/mpls.h>

#include <net/xfrm.h>



#include "ixgbe.h"

#include "ixgbe_common.h"
@@ -8599,7 +8600,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
#endif /* IXGBE_FCOE */



#ifdef CONFIG_XFRM_OFFLOAD

	if (skb->sp && !ixgbe_ipsec_tx(tx_ring, first, &ipsec_tx))

	if (xfrm_offload(skb) &&

	    !ixgbe_ipsec_tx(tx_ring, first, &ipsec_tx))

		goto out_drop;

#endif

	tso = ixgbe_tso(tx_ring, first, &hdr_len, &ipsec_tx);