Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1225eb82 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: ptrace: Move away from secure_computing_strict 



MIPS now has the infrastructure for dynamic seccomp-bpf
filtering

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6400/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 137f7df8

arch/mips/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline long regs_return_value(struct pt_regs *regs) 
#define instruction_pointer(regs) ((regs)->cp0_epc)

#define profile_pc(regs) instruction_pointer(regs)



extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);

extern asmlinkage long syscall_trace_enter(struct pt_regs *regs);

extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);



extern void die(const char *, struct pt_regs *) __noreturn;

arch/mips/kernel/ptrace.c

+6 −4
Original line number Diff line number Diff line
@@ -662,13 +662,14 @@ long arch_ptrace(struct task_struct *child, long request, 
 * Notification of system call entry/exit

 * - triggered by current->work.syscall_trace

 */

asmlinkage void syscall_trace_enter(struct pt_regs *regs)

asmlinkage long syscall_trace_enter(struct pt_regs *regs)

{

	long syscall = regs->regs[2];

	long ret = 0;

	user_exit();



	/* do the secure computing check first */

	secure_computing_strict(regs->regs[2]);

	if (secure_computing(syscall) == -1)

		return -1;



	if (test_thread_flag(TIF_SYSCALL_TRACE) &&

	    tracehook_report_syscall_entry(regs))
@@ -678,9 +679,10 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs) 
		trace_sys_enter(regs, regs->regs[2]);



	audit_syscall_entry(syscall_get_arch(current, regs),

			    regs->regs[2],

			    syscall,

			    regs->regs[4], regs->regs[5],

			    regs->regs[6], regs->regs[7]);

	return syscall;

}



/*