Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (71 commits)
  SELinux: inode_doinit_with_dentry drop no dentry printk
  SELinux: new permission between tty audit and audit socket
  SELinux: open perm for sock files
  smack: fixes for unlabeled host support
  keys: make procfiles per-user-namespace
  keys: skip keys from another user namespace
  keys: consider user namespace in key_permission
  keys: distinguish per-uid keys in different namespaces
  integrity: ima iint radix_tree_lookup locking fix
  TOMOYO: Do not call tomoyo_realpath_init unless registered.
  integrity: ima scatterlist bug fix
  smack: fix lots of kernel-doc notation
  TOMOYO: Don't create securityfs entries unless registered.
  TOMOYO: Fix exception policy read failure.
  SELinux: convert the avc cache hash list to an hlist
  SELinux: code readability with avc_cache
  SELinux: remove unused av.decided field
  SELinux: more careful use of avd in avc_has_perm_noaudit
  SELinux: remove the unused ae.used
  SELinux: check seqno when updating an avc_node
  ...

1 files changed, 96 insertions, 0 deletions

diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
new file mode 100644
index 000000000000..0b0bb8c978cc
--- /dev/null
+++ b/security/integrity/ima/ima_init.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2005,2006,2007,2008 IBM Corporation
+ *
+ * Authors:
+ * Reiner Sailer      <sailer@watson.ibm.com>
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * 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: ima_init.c
+ *             initialization and cleanup functions
+ */
+#include <linux/module.h>
+#include <linux/scatterlist.h>
+#include <linux/err.h>
+#include "ima.h"
+
+/* name for boot aggregate entry */
+static const char *boot_aggregate_name = "boot_aggregate";
+int ima_used_chip;
+
+/* Add the boot aggregate to the IMA measurement list and extend
+ * the PCR register.
+ *
+ * Calculate the boot aggregate, a SHA1 over tpm registers 0-7,
+ * assuming a TPM chip exists, and zeroes if the TPM chip does not
+ * exist.  Add the boot aggregate measurement to the measurement
+ * list and extend the PCR register.
+ *
+ * If a tpm chip does not exist, indicate the core root of trust is
+ * not hardware based by invalidating the aggregate PCR value.
+ * (The aggregate PCR value is invalidated by adding one value to
+ * the measurement list and extending the aggregate PCR value with
+ * a different value.) Violations add a zero entry to the measurement
+ * list and extend the aggregate PCR value with ff...ff's.
+ */
+static void ima_add_boot_aggregate(void)
+{
+        struct ima_template_entry *entry;
+        const char *op = "add_boot_aggregate";
+        const char *audit_cause = "ENOMEM";
+        int result = -ENOMEM;
+        int violation = 1;
+
+        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+        if (!entry)
+                goto err_out;
+
+        memset(&entry->template, 0, sizeof(entry->template));
+        strncpy(entry->template.file_name, boot_aggregate_name,
+                IMA_EVENT_NAME_LEN_MAX);
+        if (ima_used_chip) {
+                violation = 0;
+                result = ima_calc_boot_aggregate(entry->template.digest);
+                if (result < 0) {
+                        audit_cause = "hashing_error";
+                        kfree(entry);
+                        goto err_out;
+                }
+        }
+        result = ima_store_template(entry, violation, NULL);
+        if (result < 0)
+                kfree(entry);
+        return;
+err_out:
+        integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, boot_aggregate_name, op,
+                            audit_cause, result, 0);
+}
+
+int ima_init(void)
+{
+        u8 pcr_i[IMA_DIGEST_SIZE];
+        int rc;
+
+        ima_used_chip = 0;
+        rc = tpm_pcr_read(TPM_ANY_NUM, 0, pcr_i);
+        if (rc == 0)
+                ima_used_chip = 1;
+
+        if (!ima_used_chip)
+                pr_info("No TPM chip found, activating TPM-bypass!\n");
+
+        ima_add_boot_aggregate();       /* boot aggregate must be first entry */
+        ima_init_policy();
+
+        return ima_fs_init();
+}
+
+void __exit ima_cleanup(void)
+{
+        ima_fs_cleanup();
+}