a4aebe9365
Only the posix timer system calls use this (when the posix timer support is disabled, which does not actually happen in any normal case), because they had debug code to print out a warning about missing system calls. Get rid of that special case, and just use the standard COND_SYSCALL interface that creates weak system call stubs that return -ENOSYS for when the system call does not exist. This fixes a kCFI issue with the SYS_NI() hackery: CFI failure at int80_emulation+0x67/0xb0 (target: sys_ni_posix_timers+0x0/0x70; expected type: 0xb02b34d9) WARNING: CPU: 0 PID: 48 at int80_emulation+0x67/0xb0 Reported-by: kernel test robot <oliver.sang@intel.com> Reviewed-by: Sami Tolvanen <samitolvanen@google.com> Tested-by: Sami Tolvanen <samitolvanen@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
140 lines
4.7 KiB
C
140 lines
4.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* syscall_wrapper.h - s390 specific wrappers to syscall definitions
|
|
*
|
|
*/
|
|
|
|
#ifndef _ASM_S390_SYSCALL_WRAPPER_H
|
|
#define _ASM_S390_SYSCALL_WRAPPER_H
|
|
|
|
/* Mapping of registers to parameters for syscalls */
|
|
#define SC_S390_REGS_TO_ARGS(x, ...) \
|
|
__MAP(x, __SC_ARGS \
|
|
,, regs->orig_gpr2,, regs->gprs[3],, regs->gprs[4] \
|
|
,, regs->gprs[5],, regs->gprs[6],, regs->gprs[7])
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
#define __SC_COMPAT_CAST(t, a) \
|
|
({ \
|
|
long __ReS = a; \
|
|
\
|
|
BUILD_BUG_ON((sizeof(t) > 4) && !__TYPE_IS_L(t) && \
|
|
!__TYPE_IS_UL(t) && !__TYPE_IS_PTR(t) && \
|
|
!__TYPE_IS_LL(t)); \
|
|
if (__TYPE_IS_L(t)) \
|
|
__ReS = (s32)a; \
|
|
if (__TYPE_IS_UL(t)) \
|
|
__ReS = (u32)a; \
|
|
if (__TYPE_IS_PTR(t)) \
|
|
__ReS = a & 0x7fffffff; \
|
|
if (__TYPE_IS_LL(t)) \
|
|
return -ENOSYS; \
|
|
(t)__ReS; \
|
|
})
|
|
|
|
/*
|
|
* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
|
|
* named __s390x_sys_*()
|
|
*/
|
|
#define COMPAT_SYSCALL_DEFINE0(sname) \
|
|
long __s390_compat_sys_##sname(void); \
|
|
ALLOW_ERROR_INJECTION(__s390_compat_sys_##sname, ERRNO); \
|
|
long __s390_compat_sys_##sname(void)
|
|
|
|
#define SYSCALL_DEFINE0(sname) \
|
|
SYSCALL_METADATA(_##sname, 0); \
|
|
long __s390_sys_##sname(void); \
|
|
ALLOW_ERROR_INJECTION(__s390_sys_##sname, ERRNO); \
|
|
long __s390x_sys_##sname(void); \
|
|
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
|
|
static inline long __do_sys_##sname(void); \
|
|
long __s390_sys_##sname(void) \
|
|
{ \
|
|
return __do_sys_##sname(); \
|
|
} \
|
|
long __s390x_sys_##sname(void) \
|
|
{ \
|
|
return __do_sys_##sname(); \
|
|
} \
|
|
static inline long __do_sys_##sname(void)
|
|
|
|
#define COND_SYSCALL(name) \
|
|
cond_syscall(__s390x_sys_##name); \
|
|
cond_syscall(__s390_sys_##name)
|
|
|
|
#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
|
|
long __s390_compat_sys##name(struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__s390_compat_sys##name, ERRNO); \
|
|
static inline long __se_compat_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)); \
|
|
static inline long __do_compat_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__)); \
|
|
long __s390_compat_sys##name(struct pt_regs *regs) \
|
|
{ \
|
|
return __se_compat_sys##name(SC_S390_REGS_TO_ARGS(x, __VA_ARGS__)); \
|
|
} \
|
|
static inline long __se_compat_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)) \
|
|
{ \
|
|
__MAP(x, __SC_TEST, __VA_ARGS__); \
|
|
return __do_compat_sys##name(__MAP(x, __SC_DELOUSE, __VA_ARGS__)); \
|
|
} \
|
|
static inline long __do_compat_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__))
|
|
|
|
/*
|
|
* As some compat syscalls may not be implemented, we need to expand
|
|
* COND_SYSCALL_COMPAT in kernel/sys_ni.c to cover this case as well.
|
|
*/
|
|
#define COND_SYSCALL_COMPAT(name) \
|
|
cond_syscall(__s390_compat_sys_##name)
|
|
|
|
#define __S390_SYS_STUBx(x, name, ...) \
|
|
long __s390_sys##name(struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__s390_sys##name, ERRNO); \
|
|
static inline long ___se_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)); \
|
|
long __s390_sys##name(struct pt_regs *regs) \
|
|
{ \
|
|
return ___se_sys##name(SC_S390_REGS_TO_ARGS(x, __VA_ARGS__)); \
|
|
} \
|
|
static inline long ___se_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)) \
|
|
{ \
|
|
__MAP(x, __SC_TEST, __VA_ARGS__); \
|
|
return __do_sys##name(__MAP(x, __SC_COMPAT_CAST, __VA_ARGS__)); \
|
|
}
|
|
|
|
#else /* CONFIG_COMPAT */
|
|
|
|
#define SYSCALL_DEFINE0(sname) \
|
|
SYSCALL_METADATA(_##sname, 0); \
|
|
long __s390x_sys_##sname(void); \
|
|
ALLOW_ERROR_INJECTION(__s390x_sys_##sname, ERRNO); \
|
|
static inline long __do_sys_##sname(void); \
|
|
long __s390x_sys_##sname(void) \
|
|
{ \
|
|
return __do_sys_##sname(); \
|
|
} \
|
|
static inline long __do_sys_##sname(void)
|
|
|
|
#define COND_SYSCALL(name) \
|
|
cond_syscall(__s390x_sys_##name)
|
|
|
|
#define __S390_SYS_STUBx(x, fullname, name, ...)
|
|
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
#define __SYSCALL_DEFINEx(x, name, ...) \
|
|
long __s390x_sys##name(struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__s390x_sys##name, ERRNO); \
|
|
static inline long __se_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)); \
|
|
static inline long __do_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__)); \
|
|
__S390_SYS_STUBx(x, name, __VA_ARGS__); \
|
|
long __s390x_sys##name(struct pt_regs *regs) \
|
|
{ \
|
|
return __se_sys##name(SC_S390_REGS_TO_ARGS(x, __VA_ARGS__)); \
|
|
} \
|
|
static inline long __se_sys##name(__MAP(x, __SC_LONG, __VA_ARGS__)) \
|
|
{ \
|
|
__MAP(x, __SC_TEST, __VA_ARGS__); \
|
|
return __do_sys##name(__MAP(x, __SC_CAST, __VA_ARGS__)); \
|
|
} \
|
|
static inline long __do_sys##name(__MAP(x, __SC_DECL, __VA_ARGS__))
|
|
|
|
#endif /* _ASM_S390_SYSCALL_WRAPPER_H */
|