These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / security / keys / keyring.c

diff --git a/kernel/security/keys/keyring.c b/kernel/security/keys/keyring.c
index d334370..f931ccf 100644 (file)
--- a/kernel/security/keys/keyring.c
+++ b/kernel/security/keys/keyring.c
@@ -118,7 +118,7 @@ static void keyring_publish_name(struct key *keyring)
                if (!keyring_name_hash[bucket].next)
                        INIT_LIST_HEAD(&keyring_name_hash[bucket]);
 
-               list_add_tail(&keyring->type_data.link,
+               list_add_tail(&keyring->name_link,
                              &keyring_name_hash[bucket]);
 
                write_unlock(&keyring_name_lock);
@@ -387,9 +387,9 @@ static void keyring_destroy(struct key *keyring)
        if (keyring->description) {
                write_lock(&keyring_name_lock);
 
-               if (keyring->type_data.link.next != NULL &&
-                   !list_empty(&keyring->type_data.link))
-                       list_del(&keyring->type_data.link);
+               if (keyring->name_link.next != NULL &&
+                   !list_empty(&keyring->name_link))
+                       list_del(&keyring->name_link);
 
                write_unlock(&keyring_name_lock);
        }
@@ -572,7 +572,7 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
                /* we set a different error code if we pass a negative key */
                if (kflags & (1 << KEY_FLAG_NEGATIVE)) {
                        smp_rmb();
-                       ctx->result = ERR_PTR(key->type_data.reject_error);
+                       ctx->result = ERR_PTR(key->reject_error);
                        kleave(" = %d [neg]", ctx->skipped_ret);
                        goto skipped;
                }
@@ -990,7 +990,7 @@ struct key *find_keyring_by_name(const char *name, bool skip_perm_check)
                 * that's readable and that hasn't been revoked */
                list_for_each_entry(keyring,
                                    &keyring_name_hash[bucket],
-                                   type_data.link
+                                   name_link
                                    ) {
                        if (!kuid_has_mapping(current_user_ns(), keyring->user->uid))
                                continue;