Skip to content

Commit 7f1a6d4

Browse files
roidayanSaeed Mahameed
authored andcommitted
net/mlx5e: TC, Fix slab-out-of-bounds in parse_tc_actions
esw_attr is only allocated if namespace is fdb. BUG: KASAN: slab-out-of-bounds in parse_tc_actions+0xdc6/0x10e0 [mlx5_core] Write of size 4 at addr ffff88815f185b04 by task tc/2135 CPU: 5 PID: 2135 Comm: tc Not tainted 6.1.0-rc2+ #2 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x57/0x7d print_report+0x170/0x471 ? parse_tc_actions+0xdc6/0x10e0 [mlx5_core] kasan_report+0xbc/0xf0 ? parse_tc_actions+0xdc6/0x10e0 [mlx5_core] parse_tc_actions+0xdc6/0x10e0 [mlx5_core] Fixes: 94d6517 ("net/mlx5e: TC, Fix cloned flow attr instance dests are not zeroed") Signed-off-by: Roi Dayan <[email protected]> Reviewed-by: Maor Dickman <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent f4f4096 commit 7f1a6d4

File tree

1 file changed

+6
-2
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3633,10 +3633,14 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,
36333633
attr2->action = 0;
36343634
attr2->flags = 0;
36353635
attr2->parse_attr = parse_attr;
3636-
attr2->esw_attr->out_count = 0;
3637-
attr2->esw_attr->split_count = 0;
36383636
attr2->dest_chain = 0;
36393637
attr2->dest_ft = NULL;
3638+
3639+
if (ns_type == MLX5_FLOW_NAMESPACE_FDB) {
3640+
attr2->esw_attr->out_count = 0;
3641+
attr2->esw_attr->split_count = 0;
3642+
}
3643+
36403644
return attr2;
36413645
}
36423646

0 commit comments

Comments
 (0)