Commit 699d531f authored by Muhammad Sammar's avatar Muhammad Sammar Committed by Saeed Mahameed
Browse files

net/mlx5: Check dr mask size against mlx5_match_param size 



This is to allow passing misc4 match param from userspace when
function like ib_flow_matcher_create is called.

Signed-off-by: default avatarMuhammad Sammar <muhammads@nvidia.com>
Reviewed-by: default avatarAlex Vesker <valex@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 38730630

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int dr_matcher_init(struct mlx5dr_matcher *matcher, 
	}



	if (mask) {

		if (mask->match_sz > sizeof(struct mlx5dr_match_param)) {

		if (mask->match_sz > DR_SZ_MATCH_PARAM) {

			mlx5dr_err(dmn, "Invalid match size attribute\n");

			return -EINVAL;

		}

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c

+1 −2
Original line number Diff line number Diff line
@@ -874,8 +874,7 @@ static bool dr_rule_verify(struct mlx5dr_matcher *matcher, 
	u32 s_idx, e_idx;



	if (!value_size ||

	    (value_size > sizeof(struct mlx5dr_match_param) ||

	     (value_size % sizeof(u32)))) {

	    (value_size > DR_SZ_MATCH_PARAM || (value_size % sizeof(u32)))) {

		mlx5dr_err(matcher->tbl->dmn, "Rule parameters length is incorrect\n");

		return false;

	}

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define WIRE_PORT 0xFFFF

#define DR_STE_SVLAN 0x1

#define DR_STE_CVLAN 0x2

#define DR_SZ_MATCH_PARAM (MLX5_ST_SZ_DW_MATCH_PARAM * 4)



#define mlx5dr_err(dmn, arg...) mlx5_core_err((dmn)->mdev, ##arg)

#define mlx5dr_info(dmn, arg...) mlx5_core_info((dmn)->mdev, ##arg)

CRA Git | Maintained and supported by SUSTech CRA and CCSE