1 files changed, 7 insertions, 7 deletions

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index fdf75f901991..ed851574d073 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -245,14 +245,14 @@ static long keyring_read(const struct key *keyring,
  * allocate a keyring and link into the destination keyring
  */
 struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid,
-                          struct task_struct *ctx, unsigned long flags,
+                          const struct cred *cred, unsigned long flags,
                           struct key *dest)
 {
         struct key *keyring;
         int ret;
 
         keyring = key_alloc(&key_type_keyring, description,
-                            uid, gid, ctx,
+                            uid, gid, cred,
                             (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL,
                             flags);
 
@@ -281,7 +281,7 @@ struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid,
  * - we propagate the possession attribute from the keyring ref to the key ref
  */
 key_ref_t keyring_search_aux(key_ref_t keyring_ref,
-                             struct task_struct *context,
+                             const struct cred *cred,
                              struct key_type *type,
                              const void *description,
                              key_match_func_t match)
@@ -304,7 +304,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
         key_check(keyring);
 
         /* top keyring must have search permission to begin the search */
-        err = key_task_permission(keyring_ref, context, KEY_SEARCH);
+        err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
         if (err < 0) {
                 key_ref = ERR_PTR(err);
                 goto error;
@@ -377,7 +377,7 @@ descend:
 
                 /* key must have search permissions */
                 if (key_task_permission(make_key_ref(key, possessed),
-                                        context, KEY_SEARCH) < 0)
+                                        cred, KEY_SEARCH) < 0)
                         continue;
 
                 /* we set a different error code if we pass a negative key */
@@ -404,7 +404,7 @@ ascend:
                         continue;
 
                 if (key_task_permission(make_key_ref(key, possessed),
-                                        context, KEY_SEARCH) < 0)
+                                        cred, KEY_SEARCH) < 0)
                         continue;
 
                 /* stack the current position */
@@ -459,7 +459,7 @@ key_ref_t keyring_search(key_ref_t keyring,
         if (!type->match)
                 return ERR_PTR(-ENOKEY);
 
-        return keyring_search_aux(keyring, current,
+        return keyring_search_aux(keyring, current->cred,
                                   type, description, type->match);
 
 } /* end keyring_search() */