integrity: move integrity_audit_msg()

This patch moves the integrity_audit_msg() function and defintion to
security/integrity/, the parent directory, renames the 'ima_audit'
boot command line option to 'integrity_audit', and fixes the Kconfig
help text to reflect the actual code.

Changelog:
- Fixed ifdef inclusion of integrity_audit_msg() (Fengguang Wu)

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

1 files changed, 0 insertions, 64 deletions

diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c
deleted file mode 100644
index c586faae8fd6..000000000000
--- a/security/integrity/ima/ima_audit.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008 IBM Corporation
- * Author: Mimi Zohar <zohar@us.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * File: integrity_audit.c
- *      Audit calls for the integrity subsystem
- */
-
-#include <linux/fs.h>
-#include <linux/gfp.h>
-#include <linux/audit.h>
-#include "ima.h"
-
-static int ima_audit;
-
-/* ima_audit_setup - enable informational auditing messages */
-static int __init ima_audit_setup(char *str)
-{
-        unsigned long audit;
-
-        if (!strict_strtoul(str, 0, &audit))
-                ima_audit = audit ? 1 : 0;
-        return 1;
-}
-__setup("ima_audit=", ima_audit_setup);
-
-void integrity_audit_msg(int audit_msgno, struct inode *inode,
-                         const unsigned char *fname, const char *op,
-                         const char *cause, int result, int audit_info)
-{
-        struct audit_buffer *ab;
-
-        if (!ima_audit && audit_info == 1) /* Skip informational messages */
-                return;
-
-        ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno);
-        audit_log_format(ab, "pid=%d uid=%u auid=%u ses=%u",
-                         current->pid,
-                         from_kuid(&init_user_ns, current_cred()->uid),
-                         from_kuid(&init_user_ns, audit_get_loginuid(current)),
-                         audit_get_sessionid(current));
-        audit_log_task_context(ab);
-        audit_log_format(ab, " op=");
-        audit_log_string(ab, op);
-        audit_log_format(ab, " cause=");
-        audit_log_string(ab, cause);
-        audit_log_format(ab, " comm=");
-        audit_log_untrustedstring(ab, current->comm);
-        if (fname) {
-                audit_log_format(ab, " name=");
-                audit_log_untrustedstring(ab, fname);
-        }
-        if (inode) {
-                audit_log_format(ab, " dev=");
-                audit_log_untrustedstring(ab, inode->i_sb->s_id);
-                audit_log_format(ab, " ino=%lu", inode->i_ino);
-        }
-        audit_log_format(ab, " res=%d", !result);
-        audit_log_end(ab);
-}