diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2020-07-22 23:58:54 +0200 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2020-07-27 10:33:28 +0200 |
| commit | 73d6eb48d26930f0cbdc8bf1ccb0ad964e7d2b90 (patch) | |
| tree | 4cde972f30659982c9c0d4e79960b41021c368c1 /arch/s390/lib | |
| parent | 4631f3ca493a7c8f9f31aef45fc0fc0e182155b7 (diff) | |
| download | linux-stable-73d6eb48d26930f0cbdc8bf1ccb0ad964e7d2b90.tar.gz linux-stable-73d6eb48d26930f0cbdc8bf1ccb0ad964e7d2b90.tar.bz2 linux-stable-73d6eb48d26930f0cbdc8bf1ccb0ad964e7d2b90.zip | |
s390: enable HAVE_FUNCTION_ERROR_INJECTION
This kernel feature is required for enabling BPF_KPROBE_OVERRIDE.
Define override_function_with_return() and regs_set_return_value()
functions, and fix compile errors in syscall_wrapper.h.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/lib')
| -rw-r--r-- | arch/s390/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/s390/lib/error-inject.c | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile index 28fd66d558ff..678333936f78 100644 --- a/arch/s390/lib/Makefile +++ b/arch/s390/lib/Makefile @@ -14,3 +14,5 @@ KASAN_SANITIZE_uaccess.o := n obj-$(CONFIG_S390_UNWIND_SELFTEST) += test_unwind.o CFLAGS_test_unwind.o += -fno-optimize-sibling-calls + +lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o diff --git a/arch/s390/lib/error-inject.c b/arch/s390/lib/error-inject.c new file mode 100644 index 000000000000..8c9d4da87eef --- /dev/null +++ b/arch/s390/lib/error-inject.c @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +#include <asm/ptrace.h> +#include <linux/error-injection.h> +#include <linux/kprobes.h> + +void override_function_with_return(struct pt_regs *regs) +{ + /* + * Emulate 'br 14'. 'regs' is captured by kprobes on entry to some + * kernel function. + */ + regs->psw.addr = regs->gprs[14]; +} +NOKPROBE_SYMBOL(override_function_with_return); |