diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2015-01-05 12:24:47 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-01-07 11:40:58 +0000 |
| commit | 0f9132ceab112ab75d34865f5aeddf0bac234896 (patch) | |
| tree | 11209f8c56edbfe614da3bf0b8a95c90e5cfc7d9 /arch/arm64 | |
| parent | b1940cd21c0f4abdce101253e860feff547291b0 (diff) | |
| download | blackbird-obmc-linux-0f9132ceab112ab75d34865f5aeddf0bac234896.tar.gz blackbird-obmc-linux-0f9132ceab112ab75d34865f5aeddf0bac234896.zip | |
arm64: Correct __NR_compat_syscalls for bpf
Commit 97b56be10352a70c (arm64: compat: Enable bpf syscall) made the
usual mistake of forgetting to update __NR_compat_syscalls. Due to this,
when el0_sync_compat calls el0_svc_naked, the test against sc_nr
(__NR_compat_syscalls) will fail, and we'll call ni_sys, returning
-ENOSYS to userspace.
This patch bumps __NR_compat_syscalls appropriately, enabling the use of
the bpf syscall from compat tasks.
Due to the reorganisation of unistd{,32}.h as part of commit
f3e5c847ec3d12b4 (arm64: Add __NR_* definitions for compat syscalls) it
is not currently possible to include both headers and sanity-check the
value of __NR_compat_syscalls at build-time to prevent this from
happening again. Additional rework is required to make such niceties a
possibility.
Cc: Will Deacon <will.deacon@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 49c9aefd24a5..b780c6c76eec 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -44,7 +44,7 @@ #define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2) #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5) -#define __NR_compat_syscalls 386 +#define __NR_compat_syscalls 387 #endif #define __ARCH_WANT_SYS_CLONE |
