diff options
| author | Jan Kara <jack@suse.cz> | 2017-11-14 11:09:53 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-11-14 11:09:53 +0100 |
| commit | 838bee9e756ec46e9b5be25f9e44388d7e185a2a (patch) | |
| tree | ebabacacc94478173d2707ea3f931a79b7bae214 /include/linux | |
| parent | ac3d79392f8c2728f7600dd32ed88b3a1bfdc1af (diff) | |
| parent | 88d8ff976abdad043cc37dc1b4f01d93603842d7 (diff) | |
| download | linux-838bee9e756ec46e9b5be25f9e44388d7e185a2a.tar.gz linux-838bee9e756ec46e9b5be25f9e44388d7e185a2a.tar.bz2 linux-838bee9e756ec46e9b5be25f9e44388d7e185a2a.zip | |
Merge udf, isofs, quota, ext2 changes for 4.15-rc1.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/audit.h | 10 | ||||
| -rw-r--r-- | include/linux/fsnotify_backend.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index cb708eb8accc..d66220dac364 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -356,6 +356,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm, extern void __audit_log_capset(const struct cred *new, const struct cred *old); extern void __audit_mmap_fd(int fd, int flags); extern void __audit_log_kern_module(char *name); +extern void __audit_fanotify(unsigned int response); static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp) { @@ -452,6 +453,12 @@ static inline void audit_log_kern_module(char *name) __audit_log_kern_module(name); } +static inline void audit_fanotify(unsigned int response) +{ + if (!audit_dummy_context()) + __audit_fanotify(response); +} + extern int audit_n_rules; extern int audit_signals; #else /* CONFIG_AUDITSYSCALL */ @@ -568,6 +575,9 @@ static inline void audit_log_kern_module(char *name) { } +static inline void audit_fanotify(unsigned int response) +{ } + static inline void audit_ptrace(struct task_struct *t) { } #define audit_n_rules 0 diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index c6c69318752b..4a474f972910 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -190,6 +190,7 @@ struct fsnotify_group { int f_flags; unsigned int max_marks; struct user_struct *user; + bool audit; } fanotify_data; #endif /* CONFIG_FANOTIFY */ }; |