Commit 5348d631 authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Jakub Kicinski
Browse files

net/mlx5e: psp, avoid 'accel' NULL pointer dereference 



The 'accel' parameter of mlx5e_txwqe_build_eseg_csum() and the similar
'state' parameter of mlx5e_accel_tx_ids_len() were NULL when called
from mlx5i_sq_xmit() and were causing kernel panics from that context.

Fix that by passing in a local empty mlx5e_accel_tx_state variable, thus
guaranteeing that 'accel' is never NULL. Also remove an unnecessary
check from mlx5e_tx_wqe_inline_mode().

Fixes: e5a1861a ("net/mlx5e: Implement PSP Tx data path")
Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/1760511923-890650-1-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d0d3e9c2

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+4 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ mlx5e_tx_wqe_inline_mode(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	u8 mode;



#ifdef CONFIG_MLX5_EN_TLS

	if (accel && accel->tls.tls_tisn)

	if (accel->tls.tls_tisn)

		return MLX5_INLINE_MODE_TCP_UDP;

#endif
@@ -982,6 +982,7 @@ void mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	struct mlx5e_tx_attr attr;

	struct mlx5i_tx_wqe *wqe;



	struct mlx5e_accel_tx_state accel = {};

	struct mlx5_wqe_datagram_seg *datagram;

	struct mlx5_wqe_ctrl_seg *cseg;

	struct mlx5_wqe_eth_seg  *eseg;
@@ -992,7 +993,7 @@ void mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
	int num_dma;

	u16 pi;



	mlx5e_sq_xmit_prepare(sq, skb, NULL, &attr);

	mlx5e_sq_xmit_prepare(sq, skb, &accel, &attr);

	mlx5i_sq_calc_wqe_attr(skb, &attr, &wqe_attr);



	pi = mlx5e_txqsq_get_next_pi(sq, wqe_attr.num_wqebbs);
@@ -1009,7 +1010,7 @@ void mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 


	mlx5i_txwqe_build_datagram(av, dqpn, dqkey, datagram);



	mlx5e_txwqe_build_eseg_csum(sq, skb, NULL, eseg);

	mlx5e_txwqe_build_eseg_csum(sq, skb, &accel, eseg);



	eseg->mss = attr.mss;