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

[kvmfornfv.git] / kernel / fs / ecryptfs / ecryptfs_kernel.h

diff --git a/kernel/fs/ecryptfs/ecryptfs_kernel.h b/kernel/fs/ecryptfs/ecryptfs_kernel.h
index 5ba029e..7b39260 100644 (file)
--- a/kernel/fs/ecryptfs/ecryptfs_kernel.h
+++ b/kernel/fs/ecryptfs/ecryptfs_kernel.h
@@ -86,7 +86,7 @@ ecryptfs_get_encrypted_key_payload_data(struct key *key)
 {
        if (key->type == &key_type_encrypted)
                return (struct ecryptfs_auth_tok *)
-                       (&((struct encrypted_key_payload *)key->payload.data)->payload_data);
+                       (&((struct encrypted_key_payload *)key->payload.data[0])->payload_data);
        else
                return NULL;
 }
@@ -117,8 +117,7 @@ ecryptfs_get_key_payload_data(struct key *key)
 
        auth_tok = ecryptfs_get_encrypted_key_payload_data(key);
        if (!auth_tok)
-               return (struct ecryptfs_auth_tok *)
-                       (((struct user_key_payload *)key->payload.data)->data);
+               return (struct ecryptfs_auth_tok *)user_key_payload(key)->data;
        else
                return auth_tok;
 }