riscv: add audit support

On RISC-V (riscv) audit is supported through generic lib/audit.c. The patch adds required arch specific definitions.

David Abdurachmanov committed 8 years ago

Commit efe75c41 parent 8fe28cb6 files · +26 −2Browse files

Unified · Split

6 files

@@ -28,6 +28,7 @@ config RISCV · 27 unmodified lines
28	select GENERIC_STRNLEN_USER	28	select GENERIC_STRNLEN_USER
29	select GENERIC_SMP_IDLE_THREAD	29	select GENERIC_SMP_IDLE_THREAD
30	select GENERIC_ATOMIC64 if !64BIT \|\| !RISCV_ISA_A	30	select GENERIC_ATOMIC64 if !64BIT \|\| !RISCV_ISA_A
		31	select HAVE_ARCH_AUDITSYSCALL
31	select HAVE_MEMBLOCK_NODE_MAP	32	select HAVE_MEMBLOCK_NODE_MAP
32	select HAVE_DMA_CONTIGUOUS	33	select HAVE_DMA_CONTIGUOUS
33	select HAVE_FUTEX_CMPXCHG if FUTEX	34	select HAVE_FUTEX_CMPXCHG if FUTEX

 	SET_FP(regs, val);
 }
+static inline unsigned long regs_return_value(struct pt_regs *regs)
+{
+	return regs->a0;
+}
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_RISCV_PTRACE_H */

 #ifndef _ASM_RISCV_SYSCALL_H
 #define _ASM_RISCV_SYSCALL_H
+#include <uapi/linux/audit.h>
 #include <linux/sched.h>
 #include <linux/err.h>
 	memcpy(&regs->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0));
 }
+static inline int syscall_get_arch(void)
+{
+#ifdef CONFIG_64BIT
+	return AUDIT_ARCH_RISCV64;
+#else
+	return AUDIT_ARCH_RISCV32;
+#endif
+}
 #endif	/* _ASM_RISCV_SYSCALL_H */

 #define TIF_RESTORE_SIGMASK	4	/* restore signal mask in do_signal() */
 #define TIF_MEMDIE		5	/* is terminating due to OOM killer */
 #define TIF_SYSCALL_TRACEPOINT  6       /* syscall tracepoint instrumentation */
+#define TIF_SYSCALL_AUDIT	7	/* syscall auditing */
 #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
+#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
 #define _TIF_WORK_MASK \
 	(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED)
+#define _TIF_SYSCALL_WORK \
+	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_AUDIT)
 #endif /* _ASM_RISCV_THREAD_INFO_H */

@@ -201,7 +201,7 @@ handle_syscall: · 200 unmodified lines
201	REG_S s2, PT_SEPC(sp)	201	REG_S s2, PT_SEPC(sp)
202	/* Trace syscalls, but only if requested by the user. */	202	/* Trace syscalls, but only if requested by the user. */
203	REG_L t0, TASK_TI_FLAGS(tp)	203	REG_L t0, TASK_TI_FLAGS(tp)
204	andi t0, t0, _TIF_SYSCALL_TRACE	204	andi t0, t0, _TIF_SYSCALL_WORK
205	bnez t0, handle_syscall_trace_enter	205	bnez t0, handle_syscall_trace_enter
206	check_syscall_nr:	206	check_syscall_nr:
207	/* Check to make sure we don't jump to a bogus syscall number. */	207	/* Check to make sure we don't jump to a bogus syscall number. */
@@ -221,7 +221,7 @@ ret_from_syscall: · 13 unmodified lines
221	REG_S a0, PT_A0(sp)	221	REG_S a0, PT_A0(sp)
222	/* Trace syscalls, but only if requested by the user. */	222	/* Trace syscalls, but only if requested by the user. */
223	REG_L t0, TASK_TI_FLAGS(tp)	223	REG_L t0, TASK_TI_FLAGS(tp)
224	andi t0, t0, _TIF_SYSCALL_TRACE	224	andi t0, t0, _TIF_SYSCALL_WORK
225	bnez t0, handle_syscall_trace_exit	225	bnez t0, handle_syscall_trace_exit
226		226
227	ret_from_exception:	227	ret_from_exception:

 /* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */
 #define AUDIT_ARCH_PPC64	(EM_PPC64|__AUDIT_ARCH_64BIT)
 #define AUDIT_ARCH_PPC64LE	(EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_RISCV32	(EM_RISCV|__AUDIT_ARCH_LE)
+#define AUDIT_ARCH_RISCV64	(EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
 #define AUDIT_ARCH_S390		(EM_S390)
 #define AUDIT_ARCH_S390X	(EM_S390|__AUDIT_ARCH_64BIT)
 #define AUDIT_ARCH_SH		(EM_SH)

Keyboard shortcuts