Merge tag 'fbdev-v5.2' of git://github.com/bzolnier/linux

[linux-2.6-microblaze.git] / fs / crypto / policy.c

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index bd7eaf9..d536889 100644 (file)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -194,8 +194,8 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)
        res = fscrypt_get_encryption_info(child);
        if (res)
                return 0;
-       parent_ci = parent->i_crypt_info;
-       child_ci = child->i_crypt_info;
+       parent_ci = READ_ONCE(parent->i_crypt_info);
+       child_ci = READ_ONCE(child->i_crypt_info);
 
        if (parent_ci && child_ci) {
                return memcmp(parent_ci->ci_master_key_descriptor,
@@ -246,7 +246,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child,
        if (res < 0)
                return res;
 
-       ci = parent->i_crypt_info;
+       ci = READ_ONCE(parent->i_crypt_info);
        if (ci == NULL)
                return -ENOKEY;