mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 08:45:22 +00:00
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From: tonyj@suse.de
|
|
Subject: Export audit subsystem for use by modules
|
|
Patch-mainline: no
|
|
|
|
Adds necessary export symbols for audit subsystem routines.
|
|
Changes audit_log_vformat to be externally visible (analagous to vprintf)
|
|
Patch is not in mainline -- pending AppArmor code submission to lkml
|
|
|
|
Index: linux-2.6.14/include/linux/audit.h
|
|
===================================================================
|
|
--- linux-2.6.14.orig/include/linux/audit.h
|
|
+++ linux-2.6.14/include/linux/audit.h
|
|
@@ -73,6 +73,8 @@
|
|
#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */
|
|
#define AUDIT_AVC_PATH 1402 /* dentry, vfsmount pair from avc */
|
|
|
|
+#define AUDIT_SD 1500 /* AppArmor (SubDomain) audit */
|
|
+
|
|
#define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */
|
|
|
|
/* Rule flags */
|
|
@@ -265,6 +267,9 @@ extern void audit_log(struct audit_
|
|
__attribute__((format(printf,4,5)));
|
|
|
|
extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type);
|
|
+extern void audit_log_vformat(struct audit_buffer *ab,
|
|
+ const char *fmt, va_list args)
|
|
+ __attribute__((format(printf,2,0)));
|
|
extern void audit_log_format(struct audit_buffer *ab,
|
|
const char *fmt, ...)
|
|
__attribute__((format(printf,2,3)));
|
|
Index: linux-2.6.14/kernel/audit.c
|
|
===================================================================
|
|
--- linux-2.6.14.orig/kernel/audit.c
|
|
+++ linux-2.6.14/kernel/audit.c
|
|
@@ -733,8 +733,8 @@ static inline int audit_expand(struct au
|
|
* room in the audit buffer, more room will be allocated and vsnprint
|
|
* will be called a second time. Currently, we assume that a printk
|
|
* can't format message larger than 1024 bytes, so we don't either. */
|
|
-static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
|
|
- va_list args)
|
|
+void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
|
|
+ va_list args)
|
|
{
|
|
int len, avail;
|
|
struct sk_buff *skb;
|
|
@@ -895,3 +895,11 @@ void audit_log(struct audit_context *ctx
|
|
audit_log_end(ab);
|
|
}
|
|
}
|
|
+
|
|
+EXPORT_SYMBOL_GPL(audit_log_start);
|
|
+EXPORT_SYMBOL_GPL(audit_log_vformat);
|
|
+EXPORT_SYMBOL_GPL(audit_log_format);
|
|
+EXPORT_SYMBOL_GPL(audit_log_untrustedstring);
|
|
+EXPORT_SYMBOL_GPL(audit_log_d_path);
|
|
+EXPORT_SYMBOL_GPL(audit_log_end);
|
|
+EXPORT_SYMBOL_GPL(audit_log);
|