Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris:
 "Highlights:

   - Integrity: add local fs integrity verification to detect offline
     attacks
   - Integrity: add digital signature verification
   - Simple stacking of Yama with other LSMs (per LSS discussions)
   - IBM vTPM support on ppc64
   - Add new driver for Infineon I2C TIS TPM
   - Smack: add rule revocation for subject labels"

Fixed conflicts with the user namespace support in kernel/auditsc.c and
security/integrity/ima/ima_policy.c.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
  Documentation: Update git repository URL for Smack userland tools
  ima: change flags container data type
  Smack: setprocattr memory leak fix
  Smack: implement revoking all rules for a subject label
  Smack: remove task_wait() hook.
  ima: audit log hashes
  ima: generic IMA action flag handling
  ima: rename ima_must_appraise_or_measure
  audit: export audit_log_task_info
  tpm: fix tpm_acpi sparse warning on different address spaces
  samples/seccomp: fix 31 bit build on s390
  ima: digital signature verification support
  ima: add support for different security.ima data types
  ima: add ima_inode_setxattr/removexattr function and calls
  ima: add inode_post_setattr call
  ima: replace iint spinblock with rwlock/read_lock
  ima: allocating iint improvements
  ima: add appraise action keywords and default rules
  ima: integrity appraisal extension
  vfs: move ima_file_free before releasing the file
  ...

1 files changed, 62 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 0794a3017b1..e144498bcdd 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1624,6 +1624,63 @@ static void __init prom_instantiate_rtas(void)
 
 #ifdef CONFIG_PPC64
 /*
+ * Allocate room for and instantiate Stored Measurement Log (SML)
+ */
+static void __init prom_instantiate_sml(void)
+{
+        phandle ibmvtpm_node;
+        ihandle ibmvtpm_inst;
+        u32 entry = 0, size = 0;
+        u64 base;
+
+        prom_debug("prom_instantiate_sml: start...\n");
+
+        ibmvtpm_node = call_prom("finddevice", 1, 1, ADDR("/ibm,vtpm"));
+        prom_debug("ibmvtpm_node: %x\n", ibmvtpm_node);
+        if (!PHANDLE_VALID(ibmvtpm_node))
+                return;
+
+        ibmvtpm_inst = call_prom("open", 1, 1, ADDR("/ibm,vtpm"));
+        if (!IHANDLE_VALID(ibmvtpm_inst)) {
+                prom_printf("opening vtpm package failed (%x)\n", ibmvtpm_inst);
+                return;
+        }
+
+        if (call_prom_ret("call-method", 2, 2, &size,
+                          ADDR("sml-get-handover-size"),
+                          ibmvtpm_inst) != 0 || size == 0) {
+                prom_printf("SML get handover size failed\n");
+                return;
+        }
+
+        base = alloc_down(size, PAGE_SIZE, 0);
+        if (base == 0)
+                prom_panic("Could not allocate memory for sml\n");
+
+        prom_printf("instantiating sml at 0x%x...", base);
+
+        if (call_prom_ret("call-method", 4, 2, &entry,
+                          ADDR("sml-handover"),
+                          ibmvtpm_inst, size, base) != 0 || entry == 0) {
+                prom_printf("SML handover failed\n");
+                return;
+        }
+        prom_printf(" done\n");
+
+        reserve_mem(base, size);
+
+        prom_setprop(ibmvtpm_node, "/ibm,vtpm", "linux,sml-base",
+                     &base, sizeof(base));
+        prom_setprop(ibmvtpm_node, "/ibm,vtpm", "linux,sml-size",
+                     &size, sizeof(size));
+
+        prom_debug("sml base     = 0x%x\n", base);
+        prom_debug("sml size     = 0x%x\n", (long)size);
+
+        prom_debug("prom_instantiate_sml: end...\n");
+}
+
+/*
  * Allocate room for and initialize TCE tables
  */
 static void __init prom_initialize_tce_table(void)
@@ -2916,6 +2973,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                 prom_instantiate_opal();
 #endif
 
+#ifdef CONFIG_PPC64
+        /* instantiate sml */
+        prom_instantiate_sml();
+#endif
+
         /*
          * On non-powermacs, put all CPUs in spin-loops.
          *