Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (22 commits)
  [PATCH] fix audit_init failure path
  [PATCH] EXPORT_SYMBOL patch for audit_log, audit_log_start, audit_log_end and audit_format
  [PATCH] sem2mutex: audit_netlink_sem
  [PATCH] simplify audit_free() locking
  [PATCH] Fix audit operators
  [PATCH] promiscuous mode
  [PATCH] Add tty to syscall audit records
  [PATCH] add/remove rule update
  [PATCH] audit string fields interface + consumer
  [PATCH] SE Linux audit events
  [PATCH] Minor cosmetic cleanups to the code moved into auditfilter.c
  [PATCH] Fix audit record filtering with !CONFIG_AUDITSYSCALL
  [PATCH] Fix IA64 success/failure indication in syscall auditing.
  [PATCH] Miscellaneous bug and warning fixes
  [PATCH] Capture selinux subject/object context information.
  [PATCH] Exclude messages by message type
  [PATCH] Collect more inode information during syscall processing.
  [PATCH] Pass dentry, not just name, in fsnotify creation hooks.
  [PATCH] Define new range of userspace messages.
  [PATCH] Filter rule comparators
  ...

Fixed trivial conflict in security/selinux/hooks.c

1 files changed, 9 insertions, 6 deletions

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 63e0b7f29cb5..61492485de84 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1759,19 +1759,22 @@ int security_set_bools(int len, int *values)
                 goto out;
         }
 
-        printk(KERN_INFO "security: committed booleans { ");
         for (i = 0; i < len; i++) {
+                if (!!values[i] != policydb.bool_val_to_struct[i]->state) {
+                        audit_log(current->audit_context, GFP_ATOMIC,
+                                AUDIT_MAC_CONFIG_CHANGE,
+                                "bool=%s val=%d old_val=%d auid=%u",
+                                policydb.p_bool_val_to_name[i],
+                                !!values[i],
+                                policydb.bool_val_to_struct[i]->state,
+                                audit_get_loginuid(current->audit_context));
+                }
                 if (values[i]) {
                         policydb.bool_val_to_struct[i]->state = 1;
                 } else {
                         policydb.bool_val_to_struct[i]->state = 0;
                 }
-                if (i != 0)
-                        printk(", ");
-                printk("%s:%d", policydb.p_bool_val_to_name[i],
-                       policydb.bool_val_to_struct[i]->state);
         }
-        printk(" }\n");
 
         for (cur = policydb.cond_list; cur != NULL; cur = cur->next) {
                 rc = evaluate_cond_node(&policydb, cur);