Unverified Commit 9073507a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12073 kprobes: Fix deadlock issue with kmemleak 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/T53JHISSQYMLRH7WDRRRWT36DCF6JAE3/ 
 
https://gitee.com/openeuler/kernel/issues/I9K8D1 
 
Link:https://gitee.com/openeuler/kernel/pulls/12073

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents bf2653a2 861b57e6

kernel/kprobes.c

+18 −4
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ void kprobes_inc_nmissed_count(struct kprobe *p) 
}

NOKPROBE_SYMBOL(kprobes_inc_nmissed_count);



static void recycle_rp_inst(struct kretprobe_instance *ri)

static void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head)

{

	struct kretprobe *rp = ri->rp;
@@ -1235,7 +1235,7 @@ static void recycle_rp_inst(struct kretprobe_instance *ri) 
		hlist_add_head(&ri->hlist, &rp->free_instances);

		raw_spin_unlock(&rp->lock);

	} else

		kfree_rcu(ri, rcu);

		hlist_add_head(&ri->hlist, head);

}

NOKPROBE_SYMBOL(recycle_rp_inst);
@@ -1326,6 +1326,7 @@ void kprobe_flush_task(struct task_struct *tk) 
	struct hlist_head *head;

	struct hlist_node *tmp;

	unsigned long hash, flags = 0;

	HLIST_HEAD(empty_rp);



	if (unlikely(!kprobes_initialized))

		/* Early boot.  kretprobe_table_locks not yet initialized. */
@@ -1338,10 +1339,16 @@ void kprobe_flush_task(struct task_struct *tk) 
	kretprobe_table_lock(hash, &flags);

	hlist_for_each_entry_safe(ri, tmp, head, hlist) {

		if (ri->task == tk)

			recycle_rp_inst(ri);

			recycle_rp_inst(ri, &empty_rp);

	}

	kretprobe_table_unlock(hash, &flags);



	hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		INIT_HLIST_NODE(&ri->hlist);

		kfree_rcu(ri, rcu);

	}



	kprobe_busy_end();

}

NOKPROBE_SYMBOL(kprobe_flush_task);
@@ -2014,6 +2021,7 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, 
	unsigned long flags;

	kprobe_opcode_t *correct_ret_addr = NULL;

	bool skipped = false;

	HLIST_HEAD(empty_rp);



	kretprobe_hash_lock(current, &head, &flags);
@@ -2082,7 +2090,7 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, 
			__this_cpu_write(current_kprobe, prev);

		}



		recycle_rp_inst(ri);

		recycle_rp_inst(ri, &empty_rp);



		if (ri == last)

			break;
@@ -2090,6 +2098,12 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, 


	kretprobe_hash_unlock(current, &flags);



	hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {

		hlist_del(&ri->hlist);

		INIT_HLIST_NODE(&ri->hlist);

		kfree_rcu(ri, rcu);

	}



	return (unsigned long)correct_ret_addr;

}

NOKPROBE_SYMBOL(__kretprobe_trampoline_handler)