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

Commit 80381ecf authored by Yuanjun Gong's avatar Yuanjun Gong Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: fix return value check in mlx5e_ipsec_remove_trailer() 



[ Upstream commit e5bcb7564d3bd0c88613c76963c5349be9c511c5 ]

mlx5e_ipsec_remove_trailer() should return an error code if function
pskb_trim() returns an unexpected value.

Fixes: 2ac9cfe7 ("net/mlx5e: IPSec, Add Innova IPSec offload TX data path")
Signed-off-by: default avatarYuanjun Gong <ruc_gongyuanjun@163.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 800d8c96

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c

+3 −1
Original line number Diff line number Diff line
@@ -121,7 +121,9 @@ static int mlx5e_ipsec_remove_trailer(struct sk_buff *skb, struct xfrm_state *x) 


	trailer_len = alen + plen + 2;



	pskb_trim(skb, skb->len - trailer_len);

	ret = pskb_trim(skb, skb->len - trailer_len);

	if (unlikely(ret))

		return ret;

	if (skb->protocol == htons(ETH_P_IP)) {

		ipv4hdr->tot_len = htons(ntohs(ipv4hdr->tot_len) - trailer_len);

		ip_send_check(ipv4hdr);