Unverified Commit d0bc225c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9540 net/mlx5e: Avoid field-overflowing memcpy() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7FEVC7FLTA5KGVSX74XJIQXI7UFUKC5N/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA72I4 
 
Link:https://gitee.com/openeuler/kernel/pulls/9540

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 614f87b4 f2d40c36

drivers/net/ethernet/mellanox/mlx5/core/en.h

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
struct mlx5e_tx_wqe {

	struct mlx5_wqe_ctrl_seg ctrl;

	struct mlx5_wqe_eth_seg  eth;

	struct mlx5_wqe_data_seg data[0];

	struct mlx5_wqe_data_seg data[];

};



struct mlx5e_rx_wqe_ll {
@@ -215,7 +215,7 @@ struct mlx5e_umr_wqe { 
	struct mlx5_wqe_ctrl_seg       ctrl;

	struct mlx5_wqe_umr_ctrl_seg   uctrl;

	struct mlx5_mkey_seg           mkc;

	struct mlx5_mtt                inline_mtts[0];

	DECLARE_FLEX_ARRAY(struct mlx5_mtt, inline_mtts);

};



extern const char mlx5e_self_tests[][ETH_GSTRING_LEN];

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

+3 −1
Original line number Diff line number Diff line
@@ -341,8 +341,10 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, 


	/* copy the inline part if required */

	if (sq->min_inline_mode != MLX5_INLINE_MODE_NONE) {

		memcpy(eseg->inline_hdr.start, xdptxd->data, MLX5E_XDP_MIN_INLINE);

		memcpy(eseg->inline_hdr.start, xdptxd->data, sizeof(eseg->inline_hdr.start));

		eseg->inline_hdr.sz = cpu_to_be16(MLX5E_XDP_MIN_INLINE);

		memcpy(dseg, xdptxd->data + sizeof(eseg->inline_hdr.start),

		       MLX5E_XDP_MIN_INLINE - sizeof(eseg->inline_hdr.start));

		dma_len  -= MLX5E_XDP_MIN_INLINE;

		dma_addr += MLX5E_XDP_MIN_INLINE;

		dseg++;