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

!11173 tracing: Fix overflow in get_free_elt() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Chuang <liuchuang40@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EOUKRRUWJBWMGRBVGT6F7OJEEIMTNXVA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMMUB 
 
Link:https://gitee.com/openeuler/kernel/pulls/11173

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 46d28312 61444691

kernel/trace/tracing_map.c

+3 −3
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static struct tracing_map_elt *get_free_elt(struct tracing_map *map) 
	struct tracing_map_elt *elt = NULL;

	int idx;



	idx = atomic_inc_return(&map->next_elt);

	idx = atomic_fetch_add_unless(&map->next_elt, 1, map->max_elts);

	if (idx < map->max_elts) {

		elt = *(TRACING_MAP_ELT(map->elts, idx));

		if (map->ops && map->ops->elt_init)
@@ -696,7 +696,7 @@ void tracing_map_clear(struct tracing_map *map) 
{

	unsigned int i;



	atomic_set(&map->next_elt, -1);

	atomic_set(&map->next_elt, 0);

	atomic64_set(&map->hits, 0);

	atomic64_set(&map->drops, 0);
@@ -780,7 +780,7 @@ struct tracing_map *tracing_map_create(unsigned int map_bits, 


	map->map_bits = map_bits;

	map->max_elts = (1 << map_bits);

	atomic_set(&map->next_elt, -1);

	atomic_set(&map->next_elt, 0);



	map->map_size = (1 << (map_bits + 1));

	map->ops = ops;