From: Eric Biggers <ebiggers@xxxxxxxxxx>
Load 'essiv_hash_tfm' using smp_load_acquire() to guarantee that the
struct crypto_shash is seen as fully initialized before being used.
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
fs/crypto/keyinfo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index ba74dafa18a3..d1f0f8369d51 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -379,7 +379,7 @@ fscrypt_get_master_key(const struct fscrypt_info *ci, struct fscrypt_mode *mode,
static int derive_essiv_salt(const u8 *key, int keysize, u8 *salt)
{
- struct crypto_shash *tfm = READ_ONCE(essiv_hash_tfm);
+ struct crypto_shash *tfm = smp_load_acquire(&essiv_hash_tfm);
/* init hash transform on demand */
if (unlikely(!tfm)) {
--
2.21.0.225.g810b269d1ac-goog
|