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

Pull security subsystem updates from James Morris:
 "The main change in this kernel is Casey's generalized LSM stacking
  work, which removes the hard-coding of Capabilities and Yama stacking,
  allowing multiple arbitrary "small" LSMs to be stacked with a default
  monolithic module (e.g.  SELinux, Smack, AppArmor).

  See
        https://lwn.net/Articles/636056/

  This will allow smaller, simpler LSMs to be incorporated into the
  mainline kernel and arbitrarily stacked by users.  Also, this is a
  useful cleanup of the LSM code in its own right"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)
  tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add()
  vTPM: set virtual device before passing to ibmvtpm_reset_crq
  tpm_ibmvtpm: remove unneccessary message level.
  ima: update builtin policies
  ima: extend "mask" policy matching support
  ima: add support for new "euid" policy condition
  ima: fix ima_show_template_data_ascii()
  Smack: freeing an error pointer in smk_write_revoke_subj()
  selinux: fix setting of security labels on NFS
  selinux: Remove unused permission definitions
  selinux: enable genfscon labeling for sysfs and pstore files
  selinux: enable per-file labeling for debugfs files.
  selinux: update netlink socket classes
  signals: don't abuse __flush_signals() in selinux_bprm_committed_creds()
  selinux: Print 'sclass' as string when unrecognized netlink message occurs
  Smack: allow multiple labels in onlycap
  Smack: fix seq operations in smackfs
  ima: pass iint to ima_add_violation()
  ima: wrap event related data to the new ima_event_data structure
  integrity: add validity checks for 'path' parameter
  ...

3 files changed, 35 insertions, 11 deletions

diff --git a/crypto/asymmetric_keys/asymmetric_keys.h b/crypto/asymmetric_keys/asymmetric_keys.h
index f97330886d58..3f5b537ab33e 100644
--- a/crypto/asymmetric_keys/asymmetric_keys.h
+++ b/crypto/asymmetric_keys/asymmetric_keys.h
@@ -11,6 +11,9 @@
 
 extern struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id);
 
+extern int __asymmetric_key_hex_to_key_id(const char *id,
+                                          struct asymmetric_key_id *match_id,
+                                          size_t hexlen);
 static inline
 const struct asymmetric_key_ids *asymmetric_key_ids(const struct key *key)
 {
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index bcbbbd794e1d..b0e4ed23d668 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -104,6 +104,15 @@ static bool asymmetric_match_key_ids(
         return false;
 }
 
+/* helper function can be called directly with pre-allocated memory */
+inline int __asymmetric_key_hex_to_key_id(const char *id,
+                                   struct asymmetric_key_id *match_id,
+                                   size_t hexlen)
+{
+        match_id->len = hexlen;
+        return hex2bin(match_id->data, id, hexlen);
+}
+
 /**
  * asymmetric_key_hex_to_key_id - Convert a hex string into a key ID.
  * @id: The ID as a hex string.
@@ -111,21 +120,20 @@ static bool asymmetric_match_key_ids(
 struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id)
 {
         struct asymmetric_key_id *match_id;
-        size_t hexlen;
+        size_t asciihexlen;
         int ret;
 
         if (!*id)
                 return ERR_PTR(-EINVAL);
-        hexlen = strlen(id);
-        if (hexlen & 1)
+        asciihexlen = strlen(id);
+        if (asciihexlen & 1)
                 return ERR_PTR(-EINVAL);
 
-        match_id = kmalloc(sizeof(struct asymmetric_key_id) + hexlen / 2,
+        match_id = kmalloc(sizeof(struct asymmetric_key_id) + asciihexlen / 2,
                            GFP_KERNEL);
         if (!match_id)
                 return ERR_PTR(-ENOMEM);
-        match_id->len = hexlen / 2;
-        ret = hex2bin(match_id->data, id, hexlen / 2);
+        ret = __asymmetric_key_hex_to_key_id(id, match_id, asciihexlen / 2);
         if (ret < 0) {
                 kfree(match_id);
                 return ERR_PTR(-EINVAL);
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index a6c42031628e..24f17e6c5904 100644
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -28,17 +28,30 @@ static bool use_builtin_keys;
 static struct asymmetric_key_id *ca_keyid;
 
 #ifndef MODULE
+static struct {
+        struct asymmetric_key_id id;
+        unsigned char data[10];
+} cakey;
+
 static int __init ca_keys_setup(char *str)
 {
         if (!str)               /* default system keyring */
                 return 1;
 
         if (strncmp(str, "id:", 3) == 0) {
-                struct asymmetric_key_id *p;
-                p = asymmetric_key_hex_to_key_id(str + 3);
-                if (p == ERR_PTR(-EINVAL))
-                        pr_err("Unparsable hex string in ca_keys\n");
-                else if (!IS_ERR(p))
+                struct asymmetric_key_id *p = &cakey.id;
+                size_t hexlen = (strlen(str) - 3) / 2;
+                int ret;
+
+                if (hexlen == 0 || hexlen > sizeof(cakey.data)) {
+                        pr_err("Missing or invalid ca_keys id\n");
+                        return 1;
+                }
+
+                ret = __asymmetric_key_hex_to_key_id(str + 3, p, hexlen);
+                if (ret < 0)
+                        pr_err("Unparsable ca_keys id hex string\n");
+                else
                         ca_keyid = p;   /* owner key 'id:xxxxxx' */
         } else if (strcmp(str, "builtin") == 0) {
                 use_builtin_keys = true;