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

Pull security subsystem updates from James Morris:
 "In this patchset, we finally get an SELinux update, with Paul Moore
  taking over as maintainer of that code.

  Also a significant update for the Keys subsystem, as well as
  maintenance updates to Smack, IMA, TPM, and Apparmor"

and since I wanted to know more about the updates to key handling,
here's the explanation from David Howells on that:

 "Okay.  There are a number of separate bits.  I'll go over the big bits
  and the odd important other bit, most of the smaller bits are just
  fixes and cleanups.  If you want the small bits accounting for, I can
  do that too.

   (1) Keyring capacity expansion.

        KEYS: Consolidate the concept of an 'index key' for key access
        KEYS: Introduce a search context structure
        KEYS: Search for auth-key by name rather than target key ID
        Add a generic associative array implementation.
        KEYS: Expand the capacity of a keyring

     Several of the patches are providing an expansion of the capacity of a
     keyring.  Currently, the maximum size of a keyring payload is one page.
     Subtract a small header and then divide up into pointers, that only gives
     you ~500 pointers on an x86_64 box.  However, since the NFS idmapper uses
     a keyring to store ID mapping data, that has proven to be insufficient to
     the cause.

     Whatever data structure I use to handle the keyring payload, it can only
     store pointers to keys, not the keys themselves because several keyrings
     may point to a single key.  This precludes inserting, say, and rb_node
     struct into the key struct for this purpose.

     I could make an rbtree of records such that each record has an rb_node
     and a key pointer, but that would use four words of space per key stored
     in the keyring.  It would, however, be able to use much existing code.

     I selected instead a non-rebalancing radix-tree type approach as that
     could have a better space-used/key-pointer ratio.  I could have used the
     radix tree implementation that we already have and insert keys into it by
     their serial numbers, but that means any sort of search must iterate over
     the whole radix tree.  Further, its nodes are a bit on the capacious side
     for what I want - especially given that key serial numbers are randomly
     allocated, thus leaving a lot of empty space in the tree.

     So what I have is an associative array that internally is a radix-tree
     with 16 pointers per node where the index key is constructed from the key
     type pointer and the key description.  This means that an exact lookup by
     type+description is very fast as this tells us how to navigate directly to
     the target key.

     I made the data structure general in lib/assoc_array.c as far as it is
     concerned, its index key is just a sequence of bits that leads to a
     pointer.  It's possible that someone else will be able to make use of it
     also.  FS-Cache might, for example.

   (2) Mark keys as 'trusted' and keyrings as 'trusted only'.

        KEYS: verify a certificate is signed by a 'trusted' key
        KEYS: Make the system 'trusted' keyring viewable by userspace
        KEYS: Add a 'trusted' flag and a 'trusted only' flag
        KEYS: Separate the kernel signature checking keyring from module signing

     These patches allow keys carrying asymmetric public keys to be marked as
     being 'trusted' and allow keyrings to be marked as only permitting the
     addition or linkage of trusted keys.

     Keys loaded from hardware during kernel boot or compiled into the kernel
     during build are marked as being trusted automatically.  New keys can be
     loaded at runtime with add_key().  They are checked against the system
     keyring contents and if their signatures can be validated with keys that
     are already marked trusted, then they are marked trusted also and can
     thus be added into the master keyring.

     Patches from Mimi Zohar make this usable with the IMA keyrings also.

   (3) Remove the date checks on the key used to validate a module signature.

        X.509: Remove certificate date checks

     It's not reasonable to reject a signature just because the key that it was
     generated with is no longer valid datewise - especially if the kernel
     hasn't yet managed to set the system clock when the first module is
     loaded - so just remove those checks.

   (4) Make it simpler to deal with additional X.509 being loaded into the kernel.

        KEYS: Load *.x509 files into kernel keyring
        KEYS: Have make canonicalise the paths of the X.509 certs better to deduplicate

     The builder of the kernel now just places files with the extension ".x509"
     into the kernel source or build trees and they're concatenated by the
     kernel build and stuffed into the appropriate section.

   (5) Add support for userspace kerberos to use keyrings.

        KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches
        KEYS: Implement a big key type that can save to tmpfs

     Fedora went to, by default, storing kerberos tickets and tokens in tmpfs.
     We looked at storing it in keyrings instead as that confers certain
     advantages such as tickets being automatically deleted after a certain
     amount of time and the ability for the kernel to get at these tokens more
     easily.

     To make this work, two things were needed:

     (a) A way for the tickets to persist beyond the lifetime of all a user's
         sessions so that cron-driven processes can still use them.

         The problem is that a user's session keyrings are deleted when the
         session that spawned them logs out and the user's user keyring is
         deleted when the UID is deleted (typically when the last log out
         happens), so neither of these places is suitable.

         I've added a system keyring into which a 'persistent' keyring is
         created for each UID on request.  Each time a user requests their
         persistent keyring, the expiry time on it is set anew.  If the user
         doesn't ask for it for, say, three days, the keyring is automatically
         expired and garbage collected using the existing gc.  All the kerberos
         tokens it held are then also gc'd.

     (b) A key type that can hold really big tickets (up to 1MB in size).

         The problem is that Active Directory can return huge tickets with lots
         of auxiliary data attached.  We don't, however, want to eat up huge
         tracts of unswappable kernel space for this, so if the ticket is
         greater than a certain size, we create a swappable shmem file and dump
         the contents in there and just live with the fact we then have an
         inode and a dentry overhead.  If the ticket is smaller than that, we
         slap it in a kmalloc()'d buffer"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (121 commits)
  KEYS: Fix keyring content gc scanner
  KEYS: Fix error handling in big_key instantiation
  KEYS: Fix UID check in keyctl_get_persistent()
  KEYS: The RSA public key algorithm needs to select MPILIB
  ima: define '_ima' as a builtin 'trusted' keyring
  ima: extend the measurement list to include the file signature
  kernel/system_certificate.S: use real contents instead of macro GLOBAL()
  KEYS: fix error return code in big_key_instantiate()
  KEYS: Fix keyring quota misaccounting on key replacement and unlink
  KEYS: Fix a race between negating a key and reading the error set
  KEYS: Make BIG_KEYS boolean
  apparmor: remove the "task" arg from may_change_ptraced_domain()
  apparmor: remove parent task info from audit logging
  apparmor: remove tsk field from the apparmor_audit_struct
  apparmor: fix capability to not use the current task, during reporting
  Smack: Ptrace access check mode
  ima: provide hash algo info in the xattr
  ima: enable support for larger default filedata hash algorithms
  ima: define kernel parameter 'ima_template=' to change configured default
  ima: add Kconfig default measurement list template
  ...

1 files changed, 56 insertions, 46 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 8fb7c7bd4657..55d110f0aced 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -242,8 +242,8 @@ struct key *key_alloc(struct key_type *type, const char *desc,
                 }
         }
 
-        desclen = strlen(desc) + 1;
-        quotalen = desclen + type->def_datalen;
+        desclen = strlen(desc);
+        quotalen = desclen + 1 + type->def_datalen;
 
         /* get hold of the key tracking for this user */
         user = key_user_lookup(uid);
@@ -277,7 +277,8 @@ struct key *key_alloc(struct key_type *type, const char *desc,
                 goto no_memory_2;
 
         if (desc) {
-                key->description = kmemdup(desc, desclen, GFP_KERNEL);
+                key->index_key.desc_len = desclen;
+                key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
                 if (!key->description)
                         goto no_memory_3;
         }
@@ -285,7 +286,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
         atomic_set(&key->usage, 1);
         init_rwsem(&key->sem);
         lockdep_set_class(&key->sem, &type->lock_class);
-        key->type = type;
+        key->index_key.type = type;
         key->user = user;
         key->quotalen = quotalen;
         key->datalen = type->def_datalen;
@@ -299,6 +300,8 @@ struct key *key_alloc(struct key_type *type, const char *desc,
 
         if (!(flags & KEY_ALLOC_NOT_IN_QUOTA))
                 key->flags |= 1 << KEY_FLAG_IN_QUOTA;
+        if (flags & KEY_ALLOC_TRUSTED)
+                key->flags |= 1 << KEY_FLAG_TRUSTED;
 
         memset(&key->type_data, 0, sizeof(key->type_data));
 
@@ -408,7 +411,7 @@ static int __key_instantiate_and_link(struct key *key,
                                       struct key_preparsed_payload *prep,
                                       struct key *keyring,
                                       struct key *authkey,
-                                      unsigned long *_prealloc)
+                                      struct assoc_array_edit **_edit)
 {
         int ret, awaken;
 
@@ -435,7 +438,7 @@ static int __key_instantiate_and_link(struct key *key,
 
                         /* and link it into the destination keyring */
                         if (keyring)
-                                __key_link(keyring, key, _prealloc);
+                                __key_link(key, _edit);
 
                         /* disable the authorisation key */
                         if (authkey)
@@ -475,7 +478,7 @@ int key_instantiate_and_link(struct key *key,
                              struct key *authkey)
 {
         struct key_preparsed_payload prep;
-        unsigned long prealloc;
+        struct assoc_array_edit *edit;
         int ret;
 
         memset(&prep, 0, sizeof(prep));
@@ -489,17 +492,15 @@ int key_instantiate_and_link(struct key *key,
         }
 
         if (keyring) {
-                ret = __key_link_begin(keyring, key->type, key->description,
-                                       &prealloc);
+                ret = __key_link_begin(keyring, &key->index_key, &edit);
                 if (ret < 0)
                         goto error_free_preparse;
         }
 
-        ret = __key_instantiate_and_link(key, &prep, keyring, authkey,
-                                         &prealloc);
+        ret = __key_instantiate_and_link(key, &prep, keyring, authkey, &edit);
 
         if (keyring)
-                __key_link_end(keyring, key->type, prealloc);
+                __key_link_end(keyring, &key->index_key, edit);
 
 error_free_preparse:
         if (key->type->preparse)
@@ -537,7 +538,7 @@ int key_reject_and_link(struct key *key,
                         struct key *keyring,
                         struct key *authkey)
 {
-        unsigned long prealloc;
+        struct assoc_array_edit *edit;
         struct timespec now;
         int ret, awaken, link_ret = 0;
 
@@ -548,8 +549,7 @@ int key_reject_and_link(struct key *key,
         ret = -EBUSY;
 
         if (keyring)
-                link_ret = __key_link_begin(keyring, key->type,
-                                            key->description, &prealloc);
+                link_ret = __key_link_begin(keyring, &key->index_key, &edit);
 
         mutex_lock(&key_construction_mutex);
 
@@ -557,9 +557,10 @@ int key_reject_and_link(struct key *key,
         if (!test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
                 /* mark the key as being negatively instantiated */
                 atomic_inc(&key->user->nikeys);
+                key->type_data.reject_error = -error;
+                smp_wmb();
                 set_bit(KEY_FLAG_NEGATIVE, &key->flags);
                 set_bit(KEY_FLAG_INSTANTIATED, &key->flags);
-                key->type_data.reject_error = -error;
                 now = current_kernel_time();
                 key->expiry = now.tv_sec + timeout;
                 key_schedule_gc(key->expiry + key_gc_delay);
@@ -571,7 +572,7 @@ int key_reject_and_link(struct key *key,
 
                 /* and link it into the destination keyring */
                 if (keyring && link_ret == 0)
-                        __key_link(keyring, key, &prealloc);
+                        __key_link(key, &edit);
 
                 /* disable the authorisation key */
                 if (authkey)
@@ -581,7 +582,7 @@ int key_reject_and_link(struct key *key,
         mutex_unlock(&key_construction_mutex);
 
         if (keyring)
-                __key_link_end(keyring, key->type, prealloc);
+                __key_link_end(keyring, &key->index_key, edit);
 
         /* wake up anyone waiting for a key to be constructed */
         if (awaken)
@@ -645,7 +646,7 @@ found:
         /* this races with key_put(), but that doesn't matter since key_put()
          * doesn't actually change the key
          */
-        atomic_inc(&key->usage);
+        __key_get(key);
 
 error:
         spin_unlock(&key_serial_lock);
@@ -780,25 +781,27 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
                                key_perm_t perm,
                                unsigned long flags)
 {
-        unsigned long prealloc;
+        struct keyring_index_key index_key = {
+                .description    = description,
+        };
         struct key_preparsed_payload prep;
+        struct assoc_array_edit *edit;
         const struct cred *cred = current_cred();
-        struct key_type *ktype;
         struct key *keyring, *key = NULL;
         key_ref_t key_ref;
         int ret;
 
         /* look up the key type to see if it's one of the registered kernel
          * types */
-        ktype = key_type_lookup(type);
-        if (IS_ERR(ktype)) {
+        index_key.type = key_type_lookup(type);
+        if (IS_ERR(index_key.type)) {
                 key_ref = ERR_PTR(-ENODEV);
                 goto error;
         }
 
         key_ref = ERR_PTR(-EINVAL);
-        if (!ktype->match || !ktype->instantiate ||
-            (!description && !ktype->preparse))
+        if (!index_key.type->match || !index_key.type->instantiate ||
+            (!index_key.description && !index_key.type->preparse))
                 goto error_put_type;
 
         keyring = key_ref_to_ptr(keyring_ref);
@@ -812,21 +815,28 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
         memset(&prep, 0, sizeof(prep));
         prep.data = payload;
         prep.datalen = plen;
-        prep.quotalen = ktype->def_datalen;
-        if (ktype->preparse) {
-                ret = ktype->preparse(&prep);
+        prep.quotalen = index_key.type->def_datalen;
+        prep.trusted = flags & KEY_ALLOC_TRUSTED;
+        if (index_key.type->preparse) {
+                ret = index_key.type->preparse(&prep);
                 if (ret < 0) {
                         key_ref = ERR_PTR(ret);
                         goto error_put_type;
                 }
-                if (!description)
-                        description = prep.description;
+                if (!index_key.description)
+                        index_key.description = prep.description;
                 key_ref = ERR_PTR(-EINVAL);
-                if (!description)
+                if (!index_key.description)
                         goto error_free_prep;
         }
+        index_key.desc_len = strlen(index_key.description);
+
+        key_ref = ERR_PTR(-EPERM);
+        if (!prep.trusted && test_bit(KEY_FLAG_TRUSTED_ONLY, &keyring->flags))
+                goto error_free_prep;
+        flags |= prep.trusted ? KEY_ALLOC_TRUSTED : 0;
 
-        ret = __key_link_begin(keyring, ktype, description, &prealloc);
+        ret = __key_link_begin(keyring, &index_key, &edit);
         if (ret < 0) {
                 key_ref = ERR_PTR(ret);
                 goto error_free_prep;
@@ -844,10 +854,9 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
          * key of the same type and description in the destination keyring and
          * update that instead if possible
          */
-        if (ktype->update) {
-                key_ref = __keyring_search_one(keyring_ref, ktype, description,
-                                               0);
-                if (!IS_ERR(key_ref))
+        if (index_key.type->update) {
+                key_ref = find_key_to_update(keyring_ref, &index_key);
+                if (key_ref)
                         goto found_matching_key;
         }
 
@@ -856,23 +865,24 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
                 perm = KEY_POS_VIEW | KEY_POS_SEARCH | KEY_POS_LINK | KEY_POS_SETATTR;
                 perm |= KEY_USR_VIEW;
 
-                if (ktype->read)
+                if (index_key.type->read)
                         perm |= KEY_POS_READ;
 
-                if (ktype == &key_type_keyring || ktype->update)
+                if (index_key.type == &key_type_keyring ||
+                    index_key.type->update)
                         perm |= KEY_POS_WRITE;
         }
 
         /* allocate a new key */
-        key = key_alloc(ktype, description, cred->fsuid, cred->fsgid, cred,
-                        perm, flags);
+        key = key_alloc(index_key.type, index_key.description,
+                        cred->fsuid, cred->fsgid, cred, perm, flags);
         if (IS_ERR(key)) {
                 key_ref = ERR_CAST(key);
                 goto error_link_end;
         }
 
         /* instantiate it and link it into the target keyring */
-        ret = __key_instantiate_and_link(key, &prep, keyring, NULL, &prealloc);
+        ret = __key_instantiate_and_link(key, &prep, keyring, NULL, &edit);
         if (ret < 0) {
                 key_put(key);
                 key_ref = ERR_PTR(ret);
@@ -882,12 +892,12 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
         key_ref = make_key_ref(key, is_key_possessed(keyring_ref));
 
 error_link_end:
-        __key_link_end(keyring, ktype, prealloc);
+        __key_link_end(keyring, &index_key, edit);
 error_free_prep:
-        if (ktype->preparse)
-                ktype->free_preparse(&prep);
+        if (index_key.type->preparse)
+                index_key.type->free_preparse(&prep);
 error_put_type:
-        key_type_put(ktype);
+        key_type_put(index_key.type);
 error:
         return key_ref;
 
@@ -895,7 +905,7 @@ error:
         /* we found a matching key, so we're going to try to update it
          * - we can drop the locks first as we have the key pinned
          */
-        __key_link_end(keyring, ktype, prealloc);
+        __key_link_end(keyring, &index_key, edit);
 
         key_ref = __key_update(key_ref, &prep);
         goto error_free_prep;