mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 16:25:34 +00:00
972939e285
Keep the same semantic as before the commit26703c636c: deallocate audit context and fake a proper syscall exit. This fix a kernel panic triggered by the seccomp_bpf test: > [ RUN ] global.ERRNO_valid > BUG: failure at kernel/auditsc.c:1504/__audit_syscall_entry()! > Kernel panic - not syncing: BUG! Fixes:26703c636c("um/ptrace: run seccomp after ptrace") Signed-off-by: Mickaël Salaün <mic@digikod.net> Acked-by: Kees Cook <keescook@chromium.org> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: James Morris <jmorris@namei.org> Cc: user-mode-linux-devel@lists.sourceforge.net Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Kees Cook <keescook@chromium.org>
42 lines
1 KiB
C
42 lines
1 KiB
C
/*
|
|
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/seccomp.h>
|
|
#include <kern_util.h>
|
|
#include <sysdep/ptrace.h>
|
|
#include <sysdep/ptrace_user.h>
|
|
#include <sysdep/syscalls.h>
|
|
|
|
void handle_syscall(struct uml_pt_regs *r)
|
|
{
|
|
struct pt_regs *regs = container_of(r, struct pt_regs, regs);
|
|
int syscall;
|
|
|
|
/* Initialize the syscall number and default return value. */
|
|
UPT_SYSCALL_NR(r) = PT_SYSCALL_NR(r->gp);
|
|
PT_REGS_SET_SYSCALL_RETURN(regs, -ENOSYS);
|
|
|
|
if (syscall_trace_enter(regs))
|
|
goto out;
|
|
|
|
/* Do the seccomp check after ptrace; failures should be fast. */
|
|
if (secure_computing(NULL) == -1)
|
|
goto out;
|
|
|
|
/* Update the syscall number after orig_ax has potentially been updated
|
|
* with ptrace.
|
|
*/
|
|
UPT_SYSCALL_NR(r) = PT_SYSCALL_NR(r->gp);
|
|
syscall = UPT_SYSCALL_NR(r);
|
|
|
|
if (syscall >= 0 && syscall <= __NR_syscall_max)
|
|
PT_REGS_SET_SYSCALL_RETURN(regs,
|
|
EXECUTE_SYSCALL(syscall, regs));
|
|
|
|
out:
|
|
syscall_trace_leave(regs);
|
|
}
|