summaryrefslogtreecommitdiffstats
path: root/include/linux/audit.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-08 21:55:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-08 21:55:42 -0400
commit61fc5771f5e729a2ce235af42f69c8506725e84a (patch)
treee0871c1921ab43d8a46c541791927f4459ba9a84 /include/linux/audit.h
parent884922591e2b58fd7f1018701f957446d1ffac4d (diff)
parent839d05e413856bd686a33b59294d4e8238169320 (diff)
Merge tag 'audit-pr-20190702' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit
Pull audit updates from Paul Moore: "This pull request is a bit early, but with some vacation time coming up I wanted to send this out now just in case the remote Internet Gods decide not to smile on me once the merge window opens. The patchset for v5.3 is pretty minor this time, the highlights include: - When the audit daemon is sent a signal, ensure we deliver information about the sender even when syscall auditing is not enabled/supported. - Add the ability to filter audit records based on network address family. - Tighten the audit field filtering restrictions on string based fields. - Cleanup the audit field filtering verification code. - Remove a few BUG() calls from the audit code" * tag 'audit-pr-20190702' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: remove the BUG() calls in the audit rule comparison functions audit: enforce op for string fields audit: add saddr_fam filter field audit: re-structure audit field valid checks audit: deliver signal_info regarless of syscall
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r--include/linux/audit.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 3a4f2415bb7c..97d0925454df 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -182,6 +182,9 @@ static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
182} 182}
183 183
184extern u32 audit_enabled; 184extern u32 audit_enabled;
185
186extern int audit_signal_info(int sig, struct task_struct *t);
187
185#else /* CONFIG_AUDIT */ 188#else /* CONFIG_AUDIT */
186static inline __printf(4, 5) 189static inline __printf(4, 5)
187void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type, 190void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
@@ -235,6 +238,12 @@ static inline unsigned int audit_get_sessionid(struct task_struct *tsk)
235} 238}
236 239
237#define audit_enabled AUDIT_OFF 240#define audit_enabled AUDIT_OFF
241
242static inline int audit_signal_info(int sig, struct task_struct *t)
243{
244 return 0;
245}
246
238#endif /* CONFIG_AUDIT */ 247#endif /* CONFIG_AUDIT */
239 248
240#ifdef CONFIG_AUDIT_COMPAT_GENERIC 249#ifdef CONFIG_AUDIT_COMPAT_GENERIC