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

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

diff --git a/kernel/security/keys/user_defined.c b/kernel/security/keys/user_defined.c
index 36b47bb..8705d79 100644 (file)
--- a/kernel/security/keys/user_defined.c
+++ b/kernel/security/keys/user_defined.c
@@ -74,7 +74,7 @@ int user_preparse(struct key_preparsed_payload *prep)
 
        /* attach the data */
        prep->quotalen = datalen;
-       prep->payload[0] = upayload;
+       prep->payload.data[0] = upayload;
        upayload->datalen = datalen;
        memcpy(upayload->data, prep->data, datalen);
        return 0;
@@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(user_preparse);
  */
 void user_free_preparse(struct key_preparsed_payload *prep)
 {
-       kfree(prep->payload[0]);
+       kfree(prep->payload.data[0]);
 }
 EXPORT_SYMBOL_GPL(user_free_preparse);
 
@@ -120,7 +120,10 @@ int user_update(struct key *key, struct key_preparsed_payload *prep)
 
        if (ret == 0) {
                /* attach the new data, displacing the old */
-               zap = key->payload.data;
+               if (!test_bit(KEY_FLAG_NEGATIVE, &key->flags))
+                       zap = key->payload.data[0];
+               else
+                       zap = NULL;
                rcu_assign_keypointer(key, upayload);
                key->expiry = 0;
        }
@@ -140,7 +143,7 @@ EXPORT_SYMBOL_GPL(user_update);
  */
 void user_revoke(struct key *key)
 {
-       struct user_key_payload *upayload = key->payload.data;
+       struct user_key_payload *upayload = key->payload.data[0];
 
        /* clear the quota */
        key_payload_reserve(key, 0);
@@ -158,7 +161,7 @@ EXPORT_SYMBOL(user_revoke);
  */
 void user_destroy(struct key *key)
 {
-       struct user_key_payload *upayload = key->payload.data;
+       struct user_key_payload *upayload = key->payload.data[0];
 
        kfree(upayload);
 }
@@ -183,10 +186,10 @@ EXPORT_SYMBOL_GPL(user_describe);
  */
 long user_read(const struct key *key, char __user *buffer, size_t buflen)
 {
-       struct user_key_payload *upayload;
+       const struct user_key_payload *upayload;
        long ret;
 
-       upayload = rcu_dereference_key(key);
+       upayload = user_key_payload(key);
        ret = upayload->datalen;
 
        /* we can return the data as is */