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

Commit 3f6ffc8c authored by Jonas Bonn's avatar Jonas Bonn
Browse files

openrisc: Fix up audit_syscall_[entry|exit]() usage 



Commits d7e7528b and
b05d8447 simplified the usage of the
audit_syscall_[entry|exit] functions.  Unfortunately, the OpenRISC
architecture didn't get fixed up along with the other architectures when
those patches were pushed.  This makes the relevant changes to this
architecture.

Signed-off-by: default avatarJonas Bonn <jonas@southpole.se>
parent abdf8b5e

arch/openrisc/include/asm/ptrace.h

+7 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ struct pt_regs { 
	long  syscallno;	/* Syscall number (used by strace) */

	long dummy;		/* Cheap alignment fix */

};

#endif /* __ASSEMBLY__ */



/* TODO: Rename this to REDZONE because that's what it is */

#define STACK_FRAME_OVERHEAD  128  /* size of minimum stack frame */
@@ -87,6 +86,13 @@ struct pt_regs { 
#define user_stack_pointer(regs)	((unsigned long)(regs)->sp)

#define profile_pc(regs)		instruction_pointer(regs)



static inline long regs_return_value(struct pt_regs *regs)

{

	return regs->gpr[11];

}



#endif /* __ASSEMBLY__ */



/*

 * Offsets used by 'ptrace' system call interface.

 */

arch/openrisc/kernel/ptrace.c

+4 −8
Original line number Diff line number Diff line
@@ -188,8 +188,6 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) 
		 */

		ret = -1L;



	/* Are these regs right??? */

	if (unlikely(current->audit_context))

	audit_syscall_entry(audit_arch(), regs->syscallno,

			    regs->gpr[3], regs->gpr[4],

			    regs->gpr[5], regs->gpr[6]);
@@ -201,9 +199,7 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs) 
{

	int step;



	if (unlikely(current->audit_context))

		audit_syscall_exit(AUDITSC_RESULT(regs->gpr[11]),

				   regs->gpr[11]);

	audit_syscall_exit(regs);



	step = test_thread_flag(TIF_SINGLESTEP);

	if (step || test_thread_flag(TIF_SYSCALL_TRACE))