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

Pull security subsystem updates from James Morris:
 "This is basically a maintenance update for the TPM driver and EVM/IMA"

Fix up conflicts in lib/digsig.c and security/integrity/ima/ima_main.c

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (45 commits)
  tpm/ibmvtpm: build only when IBM pseries is configured
  ima: digital signature verification using asymmetric keys
  ima: rename hash calculation functions
  ima: use new crypto_shash API instead of old crypto_hash
  ima: add policy support for file system uuid
  evm: add file system uuid to EVM hmac
  tpm_tis: check pnp_acpi_device return code
  char/tpm/tpm_i2c_stm_st33: drop temporary variable for return value
  char/tpm/tpm_i2c_stm_st33: remove dead assignment in tpm_st33_i2c_probe
  char/tpm/tpm_i2c_stm_st33: Remove __devexit attribute
  char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
  tpm_i2c_stm_st33: removed unused variables/code
  TPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup
  tpm: Fix cancellation of TPM commands (interrupt mode)
  tpm: Fix cancellation of TPM commands (polling mode)
  tpm: Store TPM vendor ID
  TPM: Work around buggy TPMs that block during continue self test
  tpm_i2c_stm_st33: fix oops when i2c client is unavailable
  char/tpm: Use struct dev_pm_ops for power management
  TPM: STMicroelectronics ST33 I2C BUILD STUFF
  ...

1 files changed, 40 insertions, 41 deletions

diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index b21ee5b5495a..b691e0f3830c 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -19,38 +19,41 @@
 #include <linux/scatterlist.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <crypto/hash.h>
 #include "ima.h"
 
-static int init_desc(struct hash_desc *desc)
+static struct crypto_shash *ima_shash_tfm;
+
+int ima_init_crypto(void)
 {
-        int rc;
+        long rc;
 
-        desc->tfm = crypto_alloc_hash(ima_hash, 0, CRYPTO_ALG_ASYNC);
-        if (IS_ERR(desc->tfm)) {
-                pr_info("IMA: failed to load %s transform: %ld\n",
-                        ima_hash, PTR_ERR(desc->tfm));
-                rc = PTR_ERR(desc->tfm);
+        ima_shash_tfm = crypto_alloc_shash(ima_hash, 0, 0);
+        if (IS_ERR(ima_shash_tfm)) {
+                rc = PTR_ERR(ima_shash_tfm);
+                pr_err("Can not allocate %s (reason: %ld)\n", ima_hash, rc);
                 return rc;
         }
-        desc->flags = 0;
-        rc = crypto_hash_init(desc);
-        if (rc)
-                crypto_free_hash(desc->tfm);
-        return rc;
+        return 0;
 }
 
 /*
  * Calculate the MD5/SHA1 file digest
  */
-int ima_calc_hash(struct file *file, char *digest)
+int ima_calc_file_hash(struct file *file, char *digest)
 {
-        struct hash_desc desc;
-        struct scatterlist sg[1];
         loff_t i_size, offset = 0;
         char *rbuf;
         int rc, read = 0;
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(ima_shash_tfm)];
+        } desc;
 
-        rc = init_desc(&desc);
+        desc.shash.tfm = ima_shash_tfm;
+        desc.shash.flags = 0;
+
+        rc = crypto_shash_init(&desc.shash);
         if (rc != 0)
                 return rc;
 
@@ -75,41 +78,34 @@ int ima_calc_hash(struct file *file, char *digest)
                 if (rbuf_len == 0)
                         break;
                 offset += rbuf_len;
-                sg_init_one(sg, rbuf, rbuf_len);
 
-                rc = crypto_hash_update(&desc, sg, rbuf_len);
+                rc = crypto_shash_update(&desc.shash, rbuf, rbuf_len);
                 if (rc)
                         break;
         }
         kfree(rbuf);
         if (!rc)
-                rc = crypto_hash_final(&desc, digest);
+                rc = crypto_shash_final(&desc.shash, digest);
         if (read)
                 file->f_mode &= ~FMODE_READ;
 out:
-        crypto_free_hash(desc.tfm);
         return rc;
 }
 
 /*
- * Calculate the hash of a given template
+ * Calculate the hash of a given buffer
  */
-int ima_calc_template_hash(int template_len, void *template, char *digest)
+int ima_calc_buffer_hash(const void *data, int len, char *digest)
 {
-        struct hash_desc desc;
-        struct scatterlist sg[1];
-        int rc;
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(ima_shash_tfm)];
+        } desc;
 
-        rc = init_desc(&desc);
-        if (rc != 0)
-                return rc;
+        desc.shash.tfm = ima_shash_tfm;
+        desc.shash.flags = 0;
 
-        sg_init_one(sg, template, template_len);
-        rc = crypto_hash_update(&desc, sg, template_len);
-        if (!rc)
-                rc = crypto_hash_final(&desc, digest);
-        crypto_free_hash(desc.tfm);
-        return rc;
+        return crypto_shash_digest(&desc.shash, data, len, digest);
 }
 
 static void __init ima_pcrread(int idx, u8 *pcr)
@@ -126,12 +122,17 @@ static void __init ima_pcrread(int idx, u8 *pcr)
  */
 int __init ima_calc_boot_aggregate(char *digest)
 {
-        struct hash_desc desc;
-        struct scatterlist sg;
         u8 pcr_i[IMA_DIGEST_SIZE];
         int rc, i;
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(ima_shash_tfm)];
+        } desc;
+
+        desc.shash.tfm = ima_shash_tfm;
+        desc.shash.flags = 0;
 
-        rc = init_desc(&desc);
+        rc = crypto_shash_init(&desc.shash);
         if (rc != 0)
                 return rc;
 
@@ -139,11 +140,9 @@ int __init ima_calc_boot_aggregate(char *digest)
         for (i = TPM_PCR0; i < TPM_PCR8; i++) {
                 ima_pcrread(i, pcr_i);
                 /* now accumulate with current aggregate */
-                sg_init_one(&sg, pcr_i, IMA_DIGEST_SIZE);
-                rc = crypto_hash_update(&desc, &sg, IMA_DIGEST_SIZE);
+                rc = crypto_shash_update(&desc.shash, pcr_i, IMA_DIGEST_SIZE);
         }
         if (!rc)
-                crypto_hash_final(&desc, digest);
-        crypto_free_hash(desc.tfm);
+                crypto_shash_final(&desc.shash, digest);
         return rc;
 }