Re: [RESEND PATCH v2 0/5] x86: fix syscall function type mismatches

From: Andy Lutomirski
Date: Thu Oct 10 2019 - 14:18:03 EST


On Tue, Oct 8, 2019 at 3:41 PM Sami Tolvanen <samitolvanen@xxxxxxxxxx> wrote:
>
> This patch set changes x86 syscall wrappers and related functions to
> use function types that match sys_call_ptr_t. This fixes indirect call
> mismatches with Control-Flow Integrity (CFI) checking.

tglx, I'm pretty happy with this series. Do you need anything else
from me or do you want to just pick it up in -tip?

--Andy

>
> Changes since v1:
> - Use SYSCALL_DEFINE0 for __x64_sys_ni_syscall.
> - Include Andy's COMPAT_SYSCALL_DEFINE0 patch and use the macro
> for (rt_)sigreturn.
>
> Andy Lutomirski (1):
> x86/syscalls: Wire up COMPAT_SYSCALL_DEFINE0
>
> Sami Tolvanen (4):
> x86: use the correct function type in SYSCALL_DEFINE0
> x86: use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn
> x86: use the correct function type for sys_ni_syscall
> x86: fix function types in COND_SYSCALL
>
> arch/x86/entry/syscall_32.c | 8 +--
> arch/x86/entry/syscall_64.c | 14 +++--
> arch/x86/entry/syscalls/syscall_32.tbl | 8 +--
> arch/x86/ia32/ia32_signal.c | 5 +-
> arch/x86/include/asm/syscall_wrapper.h | 76 ++++++++++++++++++++------
> 5 files changed, 78 insertions(+), 33 deletions(-)
>
> --
> 2.23.0.581.g78d2f28ef7-goog
>