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

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

diff --git a/kernel/security/keys/key.c b/kernel/security/keys/key.c
index aee2ec5..ab7997d 100644 (file)
--- a/kernel/security/keys/key.c
+++ b/kernel/security/keys/key.c
@@ -278,7 +278,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
 
        key->index_key.desc_len = desclen;
        key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
-       if (!key->description)
+       if (!key->index_key.description)
                goto no_memory_3;
 
        atomic_set(&key->usage, 1);
@@ -554,7 +554,7 @@ 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;
+               key->reject_error = -error;
                smp_wmb();
                set_bit(KEY_FLAG_NEGATIVE, &key->flags);
                set_bit(KEY_FLAG_INSTANTIATED, &key->flags);
@@ -1046,14 +1046,14 @@ int generic_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
 
        ret = key_payload_reserve(key, prep->quotalen);
        if (ret == 0) {
-               key->type_data.p[0] = prep->type_data[0];
-               key->type_data.p[1] = prep->type_data[1];
-               rcu_assign_keypointer(key, prep->payload[0]);
-               key->payload.data2[1] = prep->payload[1];
-               prep->type_data[0] = NULL;
-               prep->type_data[1] = NULL;
-               prep->payload[0] = NULL;
-               prep->payload[1] = NULL;
+               rcu_assign_keypointer(key, prep->payload.data[0]);
+               key->payload.data[1] = prep->payload.data[1];
+               key->payload.data[2] = prep->payload.data[2];
+               key->payload.data[3] = prep->payload.data[3];
+               prep->payload.data[0] = NULL;
+               prep->payload.data[1] = NULL;
+               prep->payload.data[2] = NULL;
+               prep->payload.data[3] = NULL;
        }
        pr_devel("<==%s() = %d\n", __func__, ret);
        return ret;