Merge remote-tracking branch 'security/next'

[karo-tx-linux.git] / fs / ext4 / crypto_key.c

diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index f9270ec2a1325cce3ae87ab69dc36481fef2ca5c..c5882b36e5582d0005582d0fe3ac86cab70d9c9c 100644 (file)
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@ -120,7 +120,7 @@ int _ext4_get_encryption_info(struct inode *inode)
        struct key *keyring_key = NULL;
        struct ext4_encryption_key *master_key;
        struct ext4_encryption_context ctx;
-       struct user_key_payload *ukp;
+       const struct user_key_payload *ukp;
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        struct crypto_ablkcipher *ctfm;
        const char *cipher_str;
@@ -213,7 +213,7 @@ retry:
                res = -ENOKEY;
                goto out;
        }
-       ukp = ((struct user_key_payload *)keyring_key->payload.data);
+       ukp = user_key_payload(keyring_key);
        if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
                res = -EINVAL;
                goto out;