xnu-4570.1.46.tar.gz

[apple/xnu.git] / security / mac_audit.c

diff --git a/security/mac_audit.c b/security/mac_audit.c
index 504c55ae8ad2fd9ed58826cad5b3c00936cf5b76..5459cf54aca418096b48647401d19f6ed3331d5b 100644 (file)
--- a/security/mac_audit.c
+++ b/security/mac_audit.c
@@ -74,10 +74,6 @@
 #include <kern/kalloc.h>
 #include <kern/zalloc.h>
 
-
-int mac_audit(__unused int len, __unused u_char *data);
-
-
 #if CONFIG_AUDIT
 
 /* The zone allocator is initialized in mac_base.c. */
@@ -120,8 +116,13 @@ mac_proc_check_getauid(struct proc *curp)
        kauth_cred_t cred;
        int error;
 
-       if (!mac_proc_enforce ||
-           !mac_proc_check_enforce(curp, MAC_PROC_ENFORCE))
+#if SECURITY_MAC_CHECK_ENFORCE
+       /* 21167099 - only check if we allow write */
+       if (!mac_proc_enforce)
+               return 0;
+#endif
+    
+       if (!mac_proc_check_enforce(curp))
                return 0;
 
        cred = kauth_cred_proc_ref(curp);
@@ -137,8 +138,12 @@ mac_proc_check_setauid(struct proc *curp, uid_t auid)
        kauth_cred_t cred;
        int error;
 
-       if (!mac_proc_enforce ||
-           !mac_proc_check_enforce(curp, MAC_PROC_ENFORCE))
+#if SECURITY_MAC_CHECK_ENFORCE
+       /* 21167099 - only check if we allow write */
+       if (!mac_proc_enforce)
+               return 0;
+#endif
+       if (!mac_proc_check_enforce(curp))
                return 0;
 
        cred = kauth_cred_proc_ref(curp);
@@ -154,8 +159,12 @@ mac_proc_check_getaudit(struct proc *curp)
        kauth_cred_t cred;
        int error;
 
-       if (!mac_proc_enforce ||
-           !mac_proc_check_enforce(curp, MAC_PROC_ENFORCE))
+#if SECURITY_MAC_CHECK_ENFORCE
+       /* 21167099 - only check if we allow write */
+       if (!mac_proc_enforce)
+               return 0;
+#endif
+       if (!mac_proc_check_enforce(curp))
                return 0;
 
        cred = kauth_cred_proc_ref(curp);
@@ -171,8 +180,12 @@ mac_proc_check_setaudit(struct proc *curp, struct auditinfo_addr *ai)
        kauth_cred_t cred;
        int error;
 
-       if (!mac_proc_enforce ||
-           !mac_proc_check_enforce(curp, MAC_PROC_ENFORCE))
+#if SECURITY_MAC_CHECK_ENFORCE
+       /* 21167099 - only check if we allow write */
+       if (!mac_proc_enforce)
+               return 0;
+#endif
+       if (!mac_proc_check_enforce(curp))
                return 0;
 
        cred = kauth_cred_proc_ref(curp);
@@ -394,13 +407,6 @@ mac_audit_check_postselect(__unused struct ucred *cred, __unused unsigned short
        return (MAC_AUDIT_DEFAULT);
 }
 
-int
-mac_audit(__unused int len, __unused u_char *data)
-{
-
-       return (0);
-}
-
 int
 mac_audit_text(__unused char *text, __unused mac_policy_handle_t handle)
 {