Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 00:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tasteless #ifdef mess in audit_arch(), minor cleanups.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2005-05-19 12:08:04 +00:00
parent fdb551a4c5
commit f8280c8d3d
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/mips/kernel/ptrace.c
View File

@ -28,6 +28,7 @@
#include <linux/security.h> #include <linux/security.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <asm/byteorder.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
@ -308,21 +309,14 @@ out:
static inline int audit_arch(void) static inline int audit_arch(void)
{ {
#ifdef CONFIG_CPU_LITTLE_ENDIAN int arch = EM_MIPS;
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
if (!(current->thread.mflags & MF_32BIT_REGS)) arch |= __AUDIT_ARCH_64BIT;
return AUDIT_ARCH_MIPSEL64; #endif
#endif /* MIPS64 */ #if defined(__LITTLE_ENDIAN)
return AUDIT_ARCH_MIPSEL; arch |= __AUDIT_ARCH_LE;
#endif
#else /* big endian... */ return arch;
#ifdef CONFIG_64BIT
if (!(current->thread.mflags & MF_32BIT_REGS))
return AUDIT_ARCH_MIPS64;
#endif /* MIPS64 */
return AUDIT_ARCH_MIPS;
#endif /* endian */
} }
/* /*
@ -332,12 +326,13 @@ static inline int audit_arch(void)
asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
{ {
if (unlikely(current->audit_context) && entryexit) if (unlikely(current->audit_context) && entryexit)
audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), regs->regs[2]); audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]),
regs->regs[2]);
if (!test_thread_flag(TIF_SYSCALL_TRACE))
goto out;
if (!(current->ptrace & PT_PTRACED)) if (!(current->ptrace & PT_PTRACED))
goto out; goto out;
if (!test_thread_flag(TIF_SYSCALL_TRACE))
goto out;
/* The 0x80 provides a way for the tracing parent to distinguish /* The 0x80 provides a way for the tracing parent to distinguish
between a syscall stop and SIGTRAP delivery */ between a syscall stop and SIGTRAP delivery */