fscrypt: add Adiantum support

[zynq/linux.git] / fs / crypto / policy.c

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index c6d431a5cce932fd80385415fe598aca0f74ba05..f490de921ce82f32debeadaf22bc30f192d76e1c 100644 (file)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -199,7 +199,8 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)
        child_ci = child->i_crypt_info;
 
        if (parent_ci && child_ci) {
-               return memcmp(parent_ci->ci_master_key, child_ci->ci_master_key,
+               return memcmp(parent_ci->ci_master_key_descriptor,
+                             child_ci->ci_master_key_descriptor,
                              FS_KEY_DESCRIPTOR_SIZE) == 0 &&
                        (parent_ci->ci_data_mode == child_ci->ci_data_mode) &&
                        (parent_ci->ci_filename_mode ==
@@ -254,7 +255,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child,
        ctx.contents_encryption_mode = ci->ci_data_mode;
        ctx.filenames_encryption_mode = ci->ci_filename_mode;
        ctx.flags = ci->ci_flags;
-       memcpy(ctx.master_key_descriptor, ci->ci_master_key,
+       memcpy(ctx.master_key_descriptor, ci->ci_master_key_descriptor,
               FS_KEY_DESCRIPTOR_SIZE);
        get_random_bytes(ctx.nonce, FS_KEY_DERIVATION_NONCE_SIZE);
        BUILD_BUG_ON(sizeof(ctx) != FSCRYPT_SET_CONTEXT_MAX_SIZE);