diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-23 12:07:52 +1100 |
| commit | ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (patch) | |
| tree | 8f94d0fcb68cdcff0d00a7911ddb494705cf7c72 /fs/ext4 | |
| parent | a47c7a6c8aff0563c0ef4adf299268f3c27af0f6 (diff) | |
| parent | 146aa8b1453bd8f1ff2304ffb71b4ee0eb9acdcc (diff) | |
Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/crypto_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c index 1d510c11b100..5c52c79dea46 100644 --- a/fs/ext4/crypto_key.c +++ b/fs/ext4/crypto_key.c @@ -121,7 +121,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; @@ -209,7 +209,7 @@ retry: } crypt_info->ci_keyring_key = keyring_key; BUG_ON(keyring_key->type != &key_type_logon); - 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; |