CRED: Wrap task credential accesses in the key management code

Wrap access to task credentials so that they can be separated more easily from
the task_struct during the introduction of COW creds.

Change most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().

Change some task->e?[ug]id to task_e?[ug]id().  In some places it makes more
sense to use RCU directly rather than a convenient wrapper; these will be
addressed by later patches.

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index ba32ca6469bd..a8ebc9520cac 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -77,7 +77,7 @@ static int call_sbin_request_key(struct key_construction *cons,
         /* allocate a new session keyring */
         sprintf(desc, "_req.%u", key->serial);
 
-        keyring = keyring_alloc(desc, current->fsuid, current->fsgid, current,
+        keyring = keyring_alloc(desc, current_fsuid(), current_fsgid(), current,
                                 KEY_ALLOC_QUOTA_OVERRUN, NULL);
         if (IS_ERR(keyring)) {
                 ret = PTR_ERR(keyring);
@@ -90,8 +90,8 @@ static int call_sbin_request_key(struct key_construction *cons,
                 goto error_link;
 
         /* record the UID and GID */
-        sprintf(uid_str, "%d", current->fsuid);
-        sprintf(gid_str, "%d", current->fsgid);
+        sprintf(uid_str, "%d", current_fsuid());
+        sprintf(gid_str, "%d", current_fsgid());
 
         /* we say which key is under construction */
         sprintf(key_str, "%d", key->serial);
@@ -279,7 +279,7 @@ static int construct_alloc_key(struct key_type *type,
         mutex_lock(&user->cons_lock);
 
         key = key_alloc(type, description,
-                        current->fsuid, current->fsgid, current, KEY_POS_ALL,
+                        current_fsuid(), current_fsgid(), current, KEY_POS_ALL,
                         flags);
         if (IS_ERR(key))
                 goto alloc_failed;
@@ -342,7 +342,7 @@ static struct key *construct_key_and_link(struct key_type *type,
         struct key *key;
         int ret;
 
-        user = key_user_lookup(current->fsuid);
+        user = key_user_lookup(current_fsuid());
         if (!user)
                 return ERR_PTR(-ENOMEM);