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: David Abdurachmanov <david.abdurachmanov@gmail.com> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Родитель
8fe28cb58b
Коммит
efe75c494f
|
@ -28,6 +28,7 @@ config RISCV
|
||||||
select GENERIC_STRNLEN_USER
|
select GENERIC_STRNLEN_USER
|
||||||
select GENERIC_SMP_IDLE_THREAD
|
select GENERIC_SMP_IDLE_THREAD
|
||||||
select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
|
select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
|
||||||
|
select HAVE_ARCH_AUDITSYSCALL
|
||||||
select HAVE_MEMBLOCK_NODE_MAP
|
select HAVE_MEMBLOCK_NODE_MAP
|
||||||
select HAVE_DMA_CONTIGUOUS
|
select HAVE_DMA_CONTIGUOUS
|
||||||
select HAVE_FUTEX_CMPXCHG if FUTEX
|
select HAVE_FUTEX_CMPXCHG if FUTEX
|
||||||
|
|
|
@ -113,6 +113,11 @@ static inline void frame_pointer_set(struct pt_regs *regs,
|
||||||
SET_FP(regs, val);
|
SET_FP(regs, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline unsigned long regs_return_value(struct pt_regs *regs)
|
||||||
|
{
|
||||||
|
return regs->a0;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* _ASM_RISCV_PTRACE_H */
|
#endif /* _ASM_RISCV_PTRACE_H */
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#ifndef _ASM_RISCV_SYSCALL_H
|
#ifndef _ASM_RISCV_SYSCALL_H
|
||||||
#define _ASM_RISCV_SYSCALL_H
|
#define _ASM_RISCV_SYSCALL_H
|
||||||
|
|
||||||
|
#include <uapi/linux/audit.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
|
||||||
|
@ -99,4 +100,13 @@ static inline void syscall_set_arguments(struct task_struct *task,
|
||||||
memcpy(®s->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0));
|
memcpy(®s->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 */
|
#endif /* _ASM_RISCV_SYSCALL_H */
|
||||||
|
|
|
@ -80,13 +80,19 @@ struct thread_info {
|
||||||
#define TIF_RESTORE_SIGMASK 4 /* restore signal mask in do_signal() */
|
#define TIF_RESTORE_SIGMASK 4 /* restore signal mask in do_signal() */
|
||||||
#define TIF_MEMDIE 5 /* is terminating due to OOM killer */
|
#define TIF_MEMDIE 5 /* is terminating due to OOM killer */
|
||||||
#define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
|
#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_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
|
||||||
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
|
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
|
||||||
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
|
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
|
||||||
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
|
#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 \
|
#define _TIF_WORK_MASK \
|
||||||
(_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | _TIF_NEED_RESCHED)
|
(_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 */
|
#endif /* _ASM_RISCV_THREAD_INFO_H */
|
||||||
|
|
|
@ -201,7 +201,7 @@ handle_syscall:
|
||||||
REG_S s2, PT_SEPC(sp)
|
REG_S s2, PT_SEPC(sp)
|
||||||
/* Trace syscalls, but only if requested by the user. */
|
/* Trace syscalls, but only if requested by the user. */
|
||||||
REG_L t0, TASK_TI_FLAGS(tp)
|
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
|
bnez t0, handle_syscall_trace_enter
|
||||||
check_syscall_nr:
|
check_syscall_nr:
|
||||||
/* Check to make sure we don't jump to a bogus syscall number. */
|
/* 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)
|
REG_S a0, PT_A0(sp)
|
||||||
/* Trace syscalls, but only if requested by the user. */
|
/* Trace syscalls, but only if requested by the user. */
|
||||||
REG_L t0, TASK_TI_FLAGS(tp)
|
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
|
bnez t0, handle_syscall_trace_exit
|
||||||
|
|
||||||
ret_from_exception:
|
ret_from_exception:
|
||||||
|
|
|
@ -399,6 +399,8 @@ enum {
|
||||||
/* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */
|
/* 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_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT)
|
||||||
#define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
|
#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_S390 (EM_S390)
|
||||||
#define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT)
|
#define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT)
|
||||||
#define AUDIT_ARCH_SH (EM_SH)
|
#define AUDIT_ARCH_SH (EM_SH)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче