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

Commit bec9b2b2 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Move audit_arch() helper function to __syscall_get_arch(). 



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

arch/mips/include/asm/syscall.h

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef __ASM_MIPS_SYSCALL_H

#define __ASM_MIPS_SYSCALL_H



#include <linux/audit.h>

#include <linux/elf-em.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/uaccess.h>
@@ -80,4 +82,16 @@ extern const unsigned long sys_call_table[]; 
extern const unsigned long sys32_call_table[];

extern const unsigned long sysn32_call_table[];



static inline int __syscall_get_arch(void)

{

	int arch = EM_MIPS;

#ifdef CONFIG_64BIT

	arch |=  __AUDIT_ARCH_64BIT;

#endif

#if defined(__LITTLE_ENDIAN)

	arch |=  __AUDIT_ARCH_LE;

#endif

	return arch;

}



#endif	/* __ASM_MIPS_SYSCALL_H */

arch/mips/kernel/ptrace.c

+3 −13
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/mipsmtregs.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/syscall.h>

#include <asm/uaccess.h>

#include <asm/bootinfo.h>

#include <asm/reg.h>
@@ -647,18 +648,6 @@ long arch_ptrace(struct task_struct *child, long request, 
	return ret;

}



static inline int audit_arch(void)

{

	int arch = EM_MIPS;

#ifdef CONFIG_64BIT

	arch |=	 __AUDIT_ARCH_64BIT;

#endif

#if defined(__LITTLE_ENDIAN)

	arch |=	 __AUDIT_ARCH_LE;

#endif

	return arch;

}



/*

 * Notification of system call entry/exit

 * - triggered by current->work.syscall_trace
@@ -673,7 +662,8 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs) 
	if (test_thread_flag(TIF_SYSCALL_TRACE))

		ptrace_report_syscall(regs);



	audit_syscall_entry(audit_arch(), regs->regs[2],

	audit_syscall_entry(__syscall_get_arch(),

			    regs->regs[2],

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

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

}