audit: purge audit_log_string from the intra-kernel audit API

[sfrench/cifs-2.6.git] / security / apparmor / ipc.c

diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
index 4ecedffbdd337e5029cf7c644995d04c92124aa2..fe36d112aad9e1983beeb785884a57c1205ea073 100644 (file)
--- a/security/apparmor/ipc.c
+++ b/security/apparmor/ipc.c
@@ -20,25 +20,23 @@
 
 /**
  * audit_ptrace_mask - convert mask to permission string
- * @buffer: buffer to write string to (NOT NULL)
  * @mask: permission mask to convert
+ *
+ * Returns: pointer to static string
  */
-static void audit_ptrace_mask(struct audit_buffer *ab, u32 mask)
+static const char *audit_ptrace_mask(u32 mask)
 {
        switch (mask) {
        case MAY_READ:
-               audit_log_string(ab, "read");
-               break;
+               return "read";
        case MAY_WRITE:
-               audit_log_string(ab, "trace");
-               break;
+               return "trace";
        case AA_MAY_BE_READ:
-               audit_log_string(ab, "readby");
-               break;
+               return "readby";
        case AA_MAY_BE_TRACED:
-               audit_log_string(ab, "tracedby");
-               break;
+               return "tracedby";
        }
+       return "";
 }
 
 /* call back to audit ptrace fields */
@@ -47,12 +45,12 @@ static void audit_ptrace_cb(struct audit_buffer *ab, void *va)
        struct common_audit_data *sa = va;
 
        if (aad(sa)->request & AA_PTRACE_PERM_MASK) {
-               audit_log_format(ab, " requested_mask=");
-               audit_ptrace_mask(ab, aad(sa)->request);
+               audit_log_format(ab, " requested_mask=\"%s\"",
+                                audit_ptrace_mask(aad(sa)->request));
 
                if (aad(sa)->denied & AA_PTRACE_PERM_MASK) {
-                       audit_log_format(ab, " denied_mask=");
-                       audit_ptrace_mask(ab, aad(sa)->denied);
+                       audit_log_format(ab, " denied_mask=\"%s\"",
+                                        audit_ptrace_mask(aad(sa)->denied));
                }
        }
        audit_log_format(ab, " peer=");
@@ -142,16 +140,18 @@ static inline int map_signal_num(int sig)
 }
 
 /**
- * audit_file_mask - convert mask to permission string
- * @buffer: buffer to write string to (NOT NULL)
+ * audit_signal_mask - convert mask to permission string
  * @mask: permission mask to convert
+ *
+ * Returns: pointer to static string
  */
-static void audit_signal_mask(struct audit_buffer *ab, u32 mask)
+static const char *audit_signal_mask(u32 mask)
 {
        if (mask & MAY_READ)
-               audit_log_string(ab, "receive");
+               return "receive";
        if (mask & MAY_WRITE)
-               audit_log_string(ab, "send");
+               return "send";
+       return "";
 }
 
 /**
@@ -164,11 +164,11 @@ static void audit_signal_cb(struct audit_buffer *ab, void *va)
        struct common_audit_data *sa = va;
 
        if (aad(sa)->request & AA_SIGNAL_PERM_MASK) {
-               audit_log_format(ab, " requested_mask=");
-               audit_signal_mask(ab, aad(sa)->request);
+               audit_log_format(ab, " requested_mask=\"%s\"",
+                                audit_signal_mask(aad(sa)->request));
                if (aad(sa)->denied & AA_SIGNAL_PERM_MASK) {
-                       audit_log_format(ab, " denied_mask=");
-                       audit_signal_mask(ab, aad(sa)->denied);
+                       audit_log_format(ab, " denied_mask=\"%s\"",
+                                        audit_signal_mask(aad(sa)->denied));
                }
        }
        if (aad(sa)->signal == SIGUNKNOWN)