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

!10705 x86: stop playing stack games in profile_pc() 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RICF2G5SR4HCE6BGZKQBBL2ENFLQAFIC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEPC 
 
Link:https://gitee.com/openeuler/kernel/pulls/10705

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents e2d8499b 24ea9d0c

arch/x86/kernel/time.c

+1 −19
Original line number Diff line number Diff line
@@ -27,25 +27,7 @@ 


unsigned long profile_pc(struct pt_regs *regs)

{

	unsigned long pc = instruction_pointer(regs);



	if (!user_mode(regs) && in_lock_functions(pc)) {

#ifdef CONFIG_FRAME_POINTER

		return *(unsigned long *)(regs->bp + sizeof(long));

#else

		unsigned long *sp = (unsigned long *)regs->sp;

		/*

		 * Return address is either directly at stack pointer

		 * or above a saved flags. Eflags has bits 22-31 zero,

		 * kernel addresses don't.

		 */

		if (sp[0] >> 22)

			return sp[0];

		if (sp[1] >> 22)

			return sp[1];

#endif

	}

	return pc;

	return instruction_pointer(regs);

}

EXPORT_SYMBOL(profile_pc);