1 files changed, 10 insertions, 14 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index b782b046543d..a7b16086d36f 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -21,7 +21,7 @@
  *
  * Written by Rickard E. (Rik) Faith <faith@redhat.com>
  *
- * Goals: 1) Integrate fully with SELinux.
+ * Goals: 1) Integrate fully with Security Modules.
  *        2) Minimal run-time overhead:
  *           a) Minimal when syscall auditing is disabled (audit_enable=0).
  *           b) Small when syscall auditing is enabled and no audit record
@@ -55,7 +55,6 @@
 #include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
-#include <linux/selinux.h>
 #include <linux/inotify.h>
 #include <linux/freezer.h>
 #include <linux/tty.h>
@@ -265,13 +264,13 @@ static int audit_log_config_change(char *function_name, int new, int old,
                 char *ctx = NULL;
                 u32 len;
 
-                rc = selinux_sid_to_string(sid, &ctx, &len);
+                rc = security_secid_to_secctx(sid, &ctx, &len);
                 if (rc) {
                         audit_log_format(ab, " sid=%u", sid);
                         allow_changes = 0; /* Something weird, deny request */
                 } else {
                         audit_log_format(ab, " subj=%s", ctx);
-                        kfree(ctx);
+                        security_release_secctx(ctx, len);
                 }
         }
         audit_log_format(ab, " res=%d", allow_changes);
@@ -550,12 +549,13 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type,
         audit_log_format(*ab, "user pid=%d uid=%u auid=%u",
                          pid, uid, auid);
         if (sid) {
-                rc = selinux_sid_to_string(sid, &ctx, &len);
+                rc = security_secid_to_secctx(sid, &ctx, &len);
                 if (rc)
                         audit_log_format(*ab, " ssid=%u", sid);
-                else
+                else {
                         audit_log_format(*ab, " subj=%s", ctx);
-                kfree(ctx);
+                        security_release_secctx(ctx, len);
+                }
         }
 
         return rc;
@@ -758,18 +758,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 break;
         }
         case AUDIT_SIGNAL_INFO:
-                err = selinux_sid_to_string(audit_sig_sid, &ctx, &len);
+                err = security_secid_to_secctx(audit_sig_sid, &ctx, &len);
                 if (err)
                         return err;
                 sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
                 if (!sig_data) {
-                        kfree(ctx);
+                        security_release_secctx(ctx, len);
                         return -ENOMEM;
                 }
                 sig_data->uid = audit_sig_uid;
                 sig_data->pid = audit_sig_pid;
                 memcpy(sig_data->ctx, ctx, len);
-                kfree(ctx);
+                security_release_secctx(ctx, len);
                 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO,
                                 0, 0, sig_data, sizeof(*sig_data) + len);
                 kfree(sig_data);
@@ -881,10 +881,6 @@ static int __init audit_init(void)
         audit_enabled = audit_default;
         audit_ever_enabled |= !!audit_default;
 
-        /* Register the callback with selinux.  This callback will be invoked
-         * when a new policy is loaded. */
-        selinux_audit_set_callback(&selinux_audit_rule_update);
-
         audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized");
 
 #ifdef CONFIG_AUDITSYSCALL