diff options
| author | Linus Torvalds | 2017-11-15 13:28:48 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-15 13:28:48 -0800 |
| commit | f9bab2677ac77622618686b199073978ba263c12 (patch) | |
| tree | 0396a87240a0e00cc0fcae5a1f46c38b819ede1a /include/asm-generic | |
| parent | 373c4557d2aa362702c4c2d41288fb1e54990b7c (diff) | |
| parent | 42d5e37654e4cdb9fb2e2f3ab30045fee35c42d8 (diff) | |
Merge tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit updates from Paul Moore:
"Another relatively small pull request for audit, nine patches total.
The only real new bit of functionality is the patch from Richard which
adds the ability to filter records based on the filesystem type.
The remainder are bug fixes and cleanups; the bug fix highlights
include:
- ensuring that we properly audit init/PID-1 (me)
- allowing the audit daemon to shutdown the kernel/auditd connection
cleanly by setting the audit PID to zero (Steve)"
* tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
audit: filter PATH records keyed on filesystem magic
Audit: remove unused audit_log_secctx function
audit: Allow auditd to set pid to 0 to end auditing
audit: Add new syscalls to the perm=w filter
audit: use audit_set_enabled() in audit_enable()
audit: convert audit_ever_enabled to a boolean
audit: don't use simple_strtol() anymore
audit: initialize the audit subsystem as early as possible
audit: ensure that 'audit=1' actually enables audit for PID 1
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/audit_dir_write.h | 3 | ||||
| -rw-r--r-- | include/asm-generic/audit_write.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-generic/audit_dir_write.h b/include/asm-generic/audit_dir_write.h index 8fb83b43006a..da09fb986459 100644 --- a/include/asm-generic/audit_dir_write.h +++ b/include/asm-generic/audit_dir_write.h @@ -31,3 +31,6 @@ __NR_renameat, __NR_linkat, __NR_symlinkat, #endif +#ifdef __NR_renameat2 +__NR_renameat2, +#endif diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index dfc52b3c103f..f9f1d0ae11d9 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h @@ -20,3 +20,6 @@ __NR_ftruncate64, #ifdef __NR_bind __NR_bind, /* bind can affect fs object only in one way... */ #endif +#ifdef __NR_fallocate +__NR_fallocate, +#endif |