mlxsw: spectrum_router: Fix use of uninitialized adjacency index (ed43cff0) · Commits · 戴 / test

When mlxsw_sp_adj_discard_write() is called for the first time, the value stored in 'mlxsw_sp->router->adj_discard_index' is invalid, as indicated by 'mlxsw_sp->router->adj_discard_index_valid' being set to 'false'. In this case, we should not use the value initially stored in 'mlxsw_sp->router->adj_discard_index' (0) and instead use the value allocated later in the function. Fixes: ("mlxsw: spectrum_router: Allocate discard adjacency entry when needed") Signed-off-by:

Amit Cohen <amitc@mellanox.com> Acked-by:

Jiri Pirko <jiri@mellanox.com> Signed-off-by:

Ido Schimmel <idosch@mellanox.com> Signed-off-by:

Jakub Kicinski <jakub.kicinski@netronome.com>

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -4221,7 +4221,6 @@ mlxsw_sp_fib_entry_ralue_pack(char *ralue_pl,

		static int mlxsw_sp_adj_discard_write(struct mlxsw_sp *mlxsw_sp, u16 rif_index)
		{
		u32 adj_discard_index = mlxsw_sp->router->adj_discard_index;
		enum mlxsw_reg_ratr_trap_action trap_action;
		char ratr_pl[MLXSW_REG_RATR_LEN];
		int err;
		@@ -4236,8 +4235,8 @@ static int mlxsw_sp_adj_discard_write(struct mlxsw_sp *mlxsw_sp, u16 rif_index)

		trap_action = MLXSW_REG_RATR_TRAP_ACTION_DISCARD_ERRORS;
		mlxsw_reg_ratr_pack(ratr_pl, MLXSW_REG_RATR_OP_WRITE_WRITE_ENTRY, true,
		MLXSW_REG_RATR_TYPE_ETHERNET, adj_discard_index,
		rif_index);
		MLXSW_REG_RATR_TYPE_ETHERNET,
		mlxsw_sp->router->adj_discard_index, rif_index);
		mlxsw_reg_ratr_trap_action_set(ratr_pl, trap_action);
		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ratr), ratr_pl);
		if (err)

Admin message