60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
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.17/include/linux/audit.h
|
|
===================================================================
|
|
--- linux-2.6.17.orig/include/linux/audit.h
|
|
+++ linux-2.6.17/include/linux/audit.h
|
|
@@ -92,6 +92,8 @@
|
|
#define AUDIT_MAC_STATUS 1404 /* Changed enforcing,permissive,off */
|
|
#define AUDIT_MAC_CONFIG_CHANGE 1405 /* Changes to booleans */
|
|
|
|
+#define AUDIT_SD 1500 /* AppArmor (SubDomain) audit */
|
|
+
|
|
#define AUDIT_FIRST_KERN_ANOM_MSG 1700
|
|
#define AUDIT_LAST_KERN_ANOM_MSG 1799
|
|
#define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */
|
|
@@ -357,6 +359,9 @@
|
|
__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.17/kernel/audit.c
|
|
===================================================================
|
|
--- linux-2.6.17.orig/kernel/audit.c
|
|
+++ linux-2.6.17/kernel/audit.c
|
|
@@ -893,7 +893,7 @@
|
|
* 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,
|
|
+void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
|
|
va_list args)
|
|
{
|
|
int len, avail;
|
|
@@ -1092,7 +1092,10 @@
|
|
}
|
|
}
|
|
|
|
-EXPORT_SYMBOL(audit_log_start);
|
|
-EXPORT_SYMBOL(audit_log_end);
|
|
-EXPORT_SYMBOL(audit_log_format);
|
|
-EXPORT_SYMBOL(audit_log);
|
|
+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);
|