d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge audit and systrace checks

Browse Source 
This further shortens the syscall routine by not having to re-check after
the system call.
This commit is contained in:
Mateusz Guzik 2020-02-14 13:09:41 +00:00
parent 0e84a878c0
commit 2f7292437d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=357912
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/kern/subr_syscall.c
View File

@ -131,15 +131,6 @@ syscallenter(struct thread *td)
goto retval; goto retval;
} }
#ifdef KDTRACE_HOOKS
/* Give the syscall:::entry DTrace probe a chance to fire. */
if (__predict_false(systrace_enabled && sa->callp->sy_entry != 0))
(*systrace_probe_func)(sa, SYSTRACE_ENTRY, 0);
#endif
/* Let system calls set td_errno directly. */
td->td_pflags &= ~TDP_NERRNO;
/* /*
* Fetch fast sigblock value at the time of syscall * Fetch fast sigblock value at the time of syscall
* entry because sleepqueue primitives might call * entry because sleepqueue primitives might call
@ -147,20 +138,32 @@ syscallenter(struct thread *td)
*/ */
fetch_sigfastblock(td); fetch_sigfastblock(td);
AUDIT_SYSCALL_ENTER(sa->code, td); /* Let system calls set td_errno directly. */
error = (sa->callp->sy_call)(td, sa->args); td->td_pflags &= ~TDP_NERRNO;
AUDIT_SYSCALL_EXIT(error, td);
/* Save the latest error return value. */
if (__predict_false((td->td_pflags & TDP_NERRNO) == 0))
td->td_errno = error;
if (__predict_false(systrace_enabled || AUDIT_SYSCALL_ENTER(sa->code, td))) {
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
/* Give the syscall:::return DTrace probe a chance to fire. */ /* Give the syscall:::entry DTrace probe a chance to fire. */
if (__predict_false(systrace_enabled && sa->callp->sy_return != 0)) if (__predict_false(sa->callp->sy_entry != 0))
(*systrace_probe_func)(sa, SYSTRACE_RETURN, (*systrace_probe_func)(sa, SYSTRACE_ENTRY, 0);
error ? -1 : td->td_retval[0]);
#endif #endif
error = (sa->callp->sy_call)(td, sa->args);
/* Save the latest error return value. */
if (__predict_false((td->td_pflags & TDP_NERRNO) == 0))
td->td_errno = error;
AUDIT_SYSCALL_EXIT(error, td);
#ifdef KDTRACE_HOOKS
/* Give the syscall:::return DTrace probe a chance to fire. */
if (__predict_false(sa->callp->sy_return != 0))
(*systrace_probe_func)(sa, SYSTRACE_RETURN,
error ? -1 : td->td_retval[0]);
#endif
} else {
error = (sa->callp->sy_call)(td, sa->args);
/* Save the latest error return value. */
if (__predict_false((td->td_pflags & TDP_NERRNO) == 0))
td->td_errno = error;
}
syscall_thread_exit(td, sa->callp); syscall_thread_exit(td, sa->callp);
retval: retval:

9
sys/security/audit/audit.h
View File

@ -377,11 +377,14 @@ void audit_thread_free(struct thread *td);
audit_arg_vnode2((vp)); \ audit_arg_vnode2((vp)); \
} while (0) } while (0)
#define AUDIT_SYSCALL_ENTER(code, td) do { \ #define AUDIT_SYSCALL_ENTER(code, td) ({ \
bool _audit_entered = false; \
if (__predict_false(audit_syscalls_enabled)) { \ if (__predict_false(audit_syscalls_enabled)) { \
audit_syscall_enter(code, td); \ audit_syscall_enter(code, td); \
_audit_entered = true; \
} \ } \
} while (0) _audit_entered; \
})
/* /*
* Wrap the audit_syscall_exit() function so that it is called only when * Wrap the audit_syscall_exit() function so that it is called only when
@ -449,7 +452,7 @@ void audit_thread_free(struct thread *td);
#define AUDIT_ARG_VNODE1(vp) #define AUDIT_ARG_VNODE1(vp)
#define AUDIT_ARG_VNODE2(vp) #define AUDIT_ARG_VNODE2(vp)
#define AUDIT_SYSCALL_ENTER(code, td) #define AUDIT_SYSCALL_ENTER(code, td) 0
#define AUDIT_SYSCALL_EXIT(error, td) #define AUDIT_SYSCALL_EXIT(error, td)
#define AUDIT_SYSCLOSE(p, fd) #define AUDIT_SYSCLOSE(p, fd)

4
sys/sys/sysent.h
View File

@ -54,7 +54,11 @@ typedef void (*systrace_probe_func_t)(struct syscall_args *,
typedef void (*systrace_args_func_t)(int, void *, uint64_t *, int *); typedef void (*systrace_args_func_t)(int, void *, uint64_t *, int *);
#ifdef _KERNEL #ifdef _KERNEL
#ifdef KDTRACE_HOOKS
extern bool systrace_enabled; extern bool systrace_enabled;
#else
#define systrace_enabled 0
#endif
#endif #endif
extern systrace_probe_func_t systrace_probe_func; extern systrace_probe_func_t systrace_probe_func;