diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 17:54:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 17:54:17 -0700 |
commit | 797cee982eef9195736afc5e7f3b8f613c41d19a (patch) | |
tree | 2baf2ada982bb1c2cbe058b1378e38272cbda5d3 /include | |
parent | 7a1e8b80fb1e8ead4cec15d1fc494ed290e4d2e9 (diff) | |
parent | 43761473c254b45883a64441dd0bc85a42f3645c (diff) | |
download | linux-797cee982eef9195736afc5e7f3b8f613c41d19a.tar.bz2 |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"Six audit patches for 4.8.
There are a couple of style and minor whitespace tweaks for the logs,
as well as a minor fixup to catch errors on user filter rules, however
the major improvements are a fix to the s390 syscall argument masking
code (reviewed by the nice s390 folks), some consolidation around the
exclude filtering (less code, always a win), and a double-fetch fix
for recording the execve arguments"
* 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit:
audit: fix a double fetch in audit_log_single_execve_arg()
audit: fix whitespace in CWD record
audit: add fields to exclude filter by reusing user filter
s390: ensure that syscall arguments are properly masked on s390
audit: fix some horrible switch statement style crimes
audit: fixup: log on errors from filter user rules
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/audit.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index e38e3fc13ea8..9d4443f93db6 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -163,8 +163,6 @@ extern void audit_log_task_info(struct audit_buffer *ab, extern int audit_update_lsm_rules(void); /* Private API (for audit.c only) */ -extern int audit_filter_user(int type); -extern int audit_filter_type(int type); extern int audit_rule_change(int type, __u32 portid, int seq, void *data, size_t datasz); extern int audit_list_rules_send(struct sk_buff *request_skb, int seq); |