The generic entry expand secure_computing() in place and call __secure_computing() directly.
In order to switch to the generic entry for arm64, refactor secure_computing() for syscall_trace_enter().
No functional changes.
Signed-off-by: Jinjie Ruan ruanjinjie@huawei.com --- arch/arm64/kernel/ptrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 707951ad5d24..9af3046a2ce9 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -2387,8 +2387,11 @@ int syscall_trace_enter(struct pt_regs *regs, long syscall, unsigned long flags) }
/* Do the secure computing after ptrace; failures should be fast. */ - if (secure_computing() == -1) - return NO_SYSCALL; + if (flags & _TIF_SECCOMP) { + ret = __secure_computing(NULL); + if (ret == -1L) + return NO_SYSCALL; + }
/* Either of the above might have changed the syscall number */ syscall = syscall_get_nr(current, regs);