[PATCH] Keys: Make request-key create an authorisation key

The attached patch makes the following changes:

 (1) There's a new special key type called ".request_key_auth".

     This is an authorisation key for when one process requests a key and
     another process is started to construct it. This type of key cannot be
     created by the user; nor can it be requested by kernel services.

     Authorisation keys hold two references:

     (a) Each refers to a key being constructed. When the key being
     	 constructed is instantiated the authorisation key is revoked,
     	 rendering it of no further use.

     (b) The "authorising process". This is either:

     	 (i) the process that called request_key(), or:

     	 (ii) if the process that called request_key() itself had an
     	      authorisation key in its session keyring, then the authorising
     	      process referred to by that authorisation key will also be
     	      referred to by the new authorisation key.

	 This means that the process that initiated a chain of key requests
	 will authorise the lot of them, and will, by default, wind up with
	 the keys obtained from them in its keyrings.

 (2) request_key() creates an authorisation key which is then passed to
     /sbin/request-key in as part of a new session keyring.

 (3) When request_key() is searching for a key to hand back to the caller, if
     it comes across an authorisation key in the session keyring of the
     calling process, it will also search the keyrings of the process
     specified therein and it will use the specified process's credentials
     (fsuid, fsgid, groups) to do that rather than the calling process's
     credentials.

     This allows a process started by /sbin/request-key to find keys belonging
     to the authorising process.

 (4) A key can be read, even if the process executing KEYCTL_READ doesn't have
     direct read or search permission if that key is contained within the
     keyrings of a process specified by an authorisation key found within the
     calling process's session keyring, and is searchable using the
     credentials of the authorising process.

     This allows a process started by /sbin/request-key to read keys belonging
     to the authorising process.

 (5) The magic KEY_SPEC_*_KEYRING key IDs when passed to KEYCTL_INSTANTIATE or
     KEYCTL_NEGATE will specify a keyring of the authorising process, rather
     than the process doing the instantiation.

 (6) One of the process keyrings can be nominated as the default to which
     request_key() should attach new keys if not otherwise specified. This is
     done with KEYCTL_SET_REQKEY_KEYRING and one of the KEY_REQKEY_DEFL_*
     constants. The current setting can also be read using this call.

 (7) request_key() is partially interruptible. If it is waiting for another
     process to finish constructing a key, it can be interrupted. This permits
     a request-key cycle to be broken without recourse to rebooting.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-Off-By: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 150 insertions, 32 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 54aa7b70e63b..dfcd983af1fd 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -1,6 +1,6 @@
 /* request_key.c: request a key from userspace
  *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2004-5 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/kmod.h>
 #include <linux/err.h>
+#include <linux/keyctl.h>
 #include "internal.h"
 
 struct key_construction {
@@ -27,18 +28,26 @@ DECLARE_WAIT_QUEUE_HEAD(request_key_conswq);
 /*
  * request userspace finish the construction of a key
  * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring> <info>"
- * - if callout_info is an empty string, it'll be rendered as a "-" instead
  */
 static int call_request_key(struct key *key,
                             const char *op,
                             const char *callout_info)
 {
         struct task_struct *tsk = current;
-        unsigned long flags;
         key_serial_t prkey, sskey;
+        struct key *session_keyring, *rkakey;
         char *argv[10], *envp[3], uid_str[12], gid_str[12];
         char key_str[12], keyring_str[3][12];
-        int i;
+        int ret, i;
+
+        kenter("{%d},%s,%s", key->serial, op, callout_info);
+
+        /* generate a new session keyring with an auth key in it */
+        session_keyring = request_key_auth_new(key, &rkakey);
+        if (IS_ERR(session_keyring)) {
+                ret = PTR_ERR(session_keyring);
+                goto error;
+        }
 
         /* record the UID and GID */
         sprintf(uid_str, "%d", current->fsuid);
@@ -55,17 +64,17 @@ static int call_request_key(struct key *key,
         if (tsk->signal->process_keyring)
                 prkey = tsk->signal->process_keyring->serial;
 
-        sskey = 0;
-        spin_lock_irqsave(&tsk->sighand->siglock, flags);
-        if (tsk->signal->session_keyring)
-                sskey = tsk->signal->session_keyring->serial;
-        spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
-
+        sprintf(keyring_str[1], "%d", prkey);
 
-        if (!sskey)
+        if (tsk->signal->session_keyring) {
+                rcu_read_lock();
+                sskey = rcu_dereference(tsk->signal->session_keyring)->serial;
+                rcu_read_unlock();
+        }
+        else {
                 sskey = tsk->user->session_keyring->serial;
+        }
 
-        sprintf(keyring_str[1], "%d", prkey);
         sprintf(keyring_str[2], "%d", sskey);
 
         /* set up a minimal environment */
@@ -84,11 +93,20 @@ static int call_request_key(struct key *key,
         argv[i++] = keyring_str[0];
         argv[i++] = keyring_str[1];
         argv[i++] = keyring_str[2];
-        argv[i++] = callout_info[0] ? (char *) callout_info : "-";
+        argv[i++] = (char *) callout_info;
         argv[i] = NULL;
 
         /* do it */
-        return call_usermodehelper_keys(argv[0], argv, envp, NULL, 1);
+        ret = call_usermodehelper_keys(argv[0], argv, envp, session_keyring, 1);
+
+        /* dispose of the special keys */
+        key_revoke(rkakey);
+        key_put(rkakey);
+        key_put(session_keyring);
+
+ error:
+        kleave(" = %d", ret);
+        return ret;
 
 } /* end call_request_key() */
 
@@ -107,6 +125,8 @@ static struct key *__request_key_construction(struct key_type *type,
         struct key *key;
         int ret, negated;
 
+        kenter("%s,%s,%s", type->name, description, callout_info);
+
         /* create a key and add it to the queue */
         key = key_alloc(type, description,
                         current->fsuid, current->fsgid, KEY_USR_ALL, 0);
@@ -143,6 +163,7 @@ static struct key *__request_key_construction(struct key_type *type,
         }
 
  out:
+        kleave(" = %p", key);
         return key;
 
  request_failed:
@@ -216,6 +237,9 @@ static struct key *request_key_construction(struct key_type *type,
 
         DECLARE_WAITQUEUE(myself, current);
 
+        kenter("%s,%s,{%d},%s",
+               type->name, description, user->uid, callout_info);
+
         /* see if there's such a key under construction already */
         down_write(&key_construction_sem);
 
@@ -232,6 +256,7 @@ static struct key *request_key_construction(struct key_type *type,
         /* see about getting userspace to construct the key */
         key = __request_key_construction(type, description, callout_info);
  error:
+        kleave(" = %p", key);
         return key;
 
         /* someone else has the same key under construction
@@ -245,9 +270,11 @@ static struct key *request_key_construction(struct key_type *type,
         add_wait_queue(&request_key_conswq, &myself);
 
         for (;;) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                set_current_state(TASK_INTERRUPTIBLE);
                 if (!test_bit(KEY_FLAG_USER_CONSTRUCT, &ckey->flags))
                         break;
+                if (signal_pending(current))
+                        break;
                 schedule();
         }
 
@@ -267,21 +294,83 @@ static struct key *request_key_construction(struct key_type *type,
 
 /*****************************************************************************/
 /*
+ * link a freshly minted key to an appropriate destination keyring
+ */
+static void request_key_link(struct key *key, struct key *dest_keyring)
+{
+        struct task_struct *tsk = current;
+        struct key *drop = NULL;
+
+        kenter("{%d},%p", key->serial, dest_keyring);
+
+        /* find the appropriate keyring */
+        if (!dest_keyring) {
+                switch (tsk->jit_keyring) {
+                case KEY_REQKEY_DEFL_DEFAULT:
+                case KEY_REQKEY_DEFL_THREAD_KEYRING:
+                        dest_keyring = tsk->thread_keyring;
+                        if (dest_keyring)
+                                break;
+
+                case KEY_REQKEY_DEFL_PROCESS_KEYRING:
+                        dest_keyring = tsk->signal->process_keyring;
+                        if (dest_keyring)
+                                break;
+
+                case KEY_REQKEY_DEFL_SESSION_KEYRING:
+                        rcu_read_lock();
+                        dest_keyring = key_get(
+                                rcu_dereference(tsk->signal->session_keyring));
+                        rcu_read_unlock();
+                        drop = dest_keyring;
+
+                        if (dest_keyring)
+                                break;
+
+                case KEY_REQKEY_DEFL_USER_SESSION_KEYRING:
+                        dest_keyring = current->user->session_keyring;
+                        break;
+
+                case KEY_REQKEY_DEFL_USER_KEYRING:
+                        dest_keyring = current->user->uid_keyring;
+                        break;
+
+                case KEY_REQKEY_DEFL_GROUP_KEYRING:
+                default:
+                        BUG();
+                }
+        }
+
+        /* and attach the key to it */
+        key_link(dest_keyring, key);
+
+        key_put(drop);
+
+        kleave("");
+
+} /* end request_key_link() */
+
+/*****************************************************************************/
+/*
  * request a key
  * - search the process's keyrings
  * - check the list of keys being created or updated
- * - call out to userspace for a key if requested (supplementary info can be
- *   passed)
+ * - call out to userspace for a key if supplementary info was provided
+ * - cache the key in an appropriate keyring
  */
-struct key *request_key(struct key_type *type,
-                        const char *description,
-                        const char *callout_info)
+struct key *request_key_and_link(struct key_type *type,
+                                 const char *description,
+                                 const char *callout_info,
+                                 struct key *dest_keyring)
 {
         struct key_user *user;
         struct key *key;
 
+        kenter("%s,%s,%s,%p",
+               type->name, description, callout_info, dest_keyring);
+
         /* search all the process keyrings for a key */
-        key = search_process_keyrings_aux(type, description, type->match);
+        key = search_process_keyrings(type, description, type->match, current);
 
         if (PTR_ERR(key) == -EAGAIN) {
                 /* the search failed, but the keyrings were searchable, so we
@@ -292,12 +381,13 @@ struct key *request_key(struct key_type *type,
 
                 /* - get hold of the user's construction queue */
                 user = key_user_lookup(current->fsuid);
-                if (!user) {
-                        key = ERR_PTR(-ENOMEM);
-                        goto error;
-                }
+                if (!user)
+                        goto nomem;
+
+                do {
+                        if (signal_pending(current))
+                                goto interrupted;
 
-                for (;;) {
                         /* ask userspace (returns NULL if it waited on a key
                          * being constructed) */
                         key = request_key_construction(type, description,
@@ -307,18 +397,46 @@ struct key *request_key(struct key_type *type,
 
                         /* someone else made the key we want, so we need to
                          * search again as it might now be available to us */
-                        key = search_process_keyrings_aux(type, description,
-                                                          type->match);
-                        if (PTR_ERR(key) != -EAGAIN)
-                                break;
-                }
+                        key = search_process_keyrings(type, description,
+                                                      type->match, current);
+
+                } while (PTR_ERR(key) == -EAGAIN);
 
                 key_user_put(user);
+
+                /* link the new key into the appropriate keyring */
+                if (!PTR_ERR(key))
+                        request_key_link(key, dest_keyring);
         }
 
- error:
+error:
+        kleave(" = %p", key);
         return key;
 
+nomem:
+        key = ERR_PTR(-ENOMEM);
+        goto error;
+
+interrupted:
+        key_user_put(user);
+        key = ERR_PTR(-EINTR);
+        goto error;
+
+} /* end request_key_and_link() */
+
+/*****************************************************************************/
+/*
+ * request a key
+ * - search the process's keyrings
+ * - check the list of keys being created or updated
+ * - call out to userspace for a key if supplementary info was provided
+ */
+struct key *request_key(struct key_type *type,
+                        const char *description,
+                        const char *callout_info)
+{
+        return request_key_and_link(type, description, callout_info, NULL);
+
 } /* end request_key() */
 
 EXPORT_SYMBOL(request_key);