Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f78329ce authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: x86: use the correct function type for sys32_(rt_)sigreturn 



Use the correct function type to avoid tripping Control-Flow
Integrity checking.

Bug: 133186739
Change-Id: I6a145ba075f8902a5883e6374328643b3771b1eb
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 5dda676c

arch/x86/ia32/ia32_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, 
	return err;

}



asmlinkage long sys32_sigreturn(void)

asmlinkage long sys32_sigreturn(const struct pt_regs *__unused)

{

	struct pt_regs *regs = current_pt_regs();

	struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8);
@@ -139,7 +139,7 @@ asmlinkage long sys32_sigreturn(void) 
	return 0;

}



asmlinkage long sys32_rt_sigreturn(void)

asmlinkage long sys32_rt_sigreturn(const struct pt_regs *__unused)

{

	struct pt_regs *regs = current_pt_regs();

	struct rt_sigframe_ia32 __user *frame;