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

Unverified Commit efe75c49 authored by David Abdurachmanov's avatar David Abdurachmanov Committed by Palmer Dabbelt
Browse files

riscv: add audit support 



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

Signed-off-by: default avatarDavid Abdurachmanov <david.abdurachmanov@gmail.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 8fe28cb5

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config RISCV 
	select GENERIC_STRNLEN_USER

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_DMA_CONTIGUOUS

	select HAVE_FUTEX_CMPXCHG if FUTEX

arch/riscv/include/asm/ptrace.h

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ static inline void frame_pointer_set(struct pt_regs *regs, 
	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 */

arch/riscv/include/asm/syscall.h

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef _ASM_RISCV_SYSCALL_H

#define _ASM_RISCV_SYSCALL_H



#include <uapi/linux/audit.h>

#include <linux/sched.h>

#include <linux/err.h>
@@ -99,4 +100,13 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	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 */

arch/riscv/include/asm/thread_info.h

+6 −0
Original line number Diff line number Diff line
@@ -80,13 +80,19 @@ struct thread_info { 
#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 */

arch/riscv/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ handle_syscall: 
	REG_S s2, PT_SEPC(sp)

	/* Trace syscalls, but only if requested by the user. */

	REG_L t0, TASK_TI_FLAGS(tp)

	andi t0, t0, _TIF_SYSCALL_TRACE

	andi t0, t0, _TIF_SYSCALL_WORK

	bnez t0, handle_syscall_trace_enter

check_syscall_nr:

	/* Check to make sure we don't jump to a bogus syscall number. */
@@ -221,7 +221,7 @@ ret_from_syscall: 
	REG_S a0, PT_A0(sp)

	/* Trace syscalls, but only if requested by the user. */

	REG_L t0, TASK_TI_FLAGS(tp)

	andi t0, t0, _TIF_SYSCALL_TRACE

	andi t0, t0, _TIF_SYSCALL_WORK

	bnez t0, handle_syscall_trace_exit



ret_from_exception: