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

!10094 net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B2SEUYHN6U435252DGBWFRPHEXUYKXAT/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACR2K 
 
Link:https://gitee.com/openeuler/kernel/pulls/10094

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents af839afc d6e26d67

net/sched/act_api.c

+1 −2
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ int tcf_idr_check_alloc(struct tc_action_net *tn, u32 *index, 
	struct tc_action *p;

	int ret;



again:

	spin_lock(&idrinfo->lock);

	if (*index) {

		p = idr_find(&idrinfo->action_idr, *index);
@@ -449,7 +448,7 @@ int tcf_idr_check_alloc(struct tc_action_net *tn, u32 *index, 
			 * index but did not assign the pointer yet.

			 */

			spin_unlock(&idrinfo->lock);

			goto again;

			return -EAGAIN;

		}



		if (p) {