Unverified Commit 80100942 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Fix a handful of audit-related issue 

This is sort of a mix between a new feature and a bug fix.  I've managed
to screw up merging this patch set a handful of times but I think it's
OK this time around.  The main new feature here is audit support for
RISC-V, with some fixes to audit-related bugs that cropped up along the
way:

* The addition of NR_syscalls into unistd.h, which is necessary for
  CONFIG_FTRACE_SYSCALLS.
* The definition of CREATE_TRACE_POINTS so
  __tracepoint_sys_{enter,exit} get defined.
* A fix for trace_sys_exit() so we can enable
  CONFIG_HAVE_SYSCALL_TRACEPOINTS.
parents 2cffc956 5aeb1b36

arch/riscv/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ 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

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_PERF_EVENTS

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select RISCV_ISA_A if SMP

	select SPARSE_IRQ

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/include/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -19,3 +19,5 @@ 
#define __ARCH_WANT_SYS_CLONE



#include <uapi/asm/unistd.h>



#define NR_syscalls (__NR_syscalls)

CRA Git | Maintained and supported by SUSTech CRA and CCSE