fscrypt: add memory barrier when loading essiv_hash_tfm
Subsystems (2)
Eric Biggers
maintainerPATCH 1/1 fscrypt: add memory barrier when loading essiv_hash_tfm
From: Eric Biggers <[email protected]>
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 <[email protected]>
--- fs/crypto/keyinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/crypto/keyinfo.c +1 -1
@@ -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)) {
Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Eric Biggers
maintainerQuoted 26 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Load '
essiv_hash_tfm' usingsmp_load_acquire()to guarantee that the structcrypto_shashis seen as fully initialized before being used.Signed-off-by Eric Biggers <[email protected]>--- fs/crypto/keyinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/crypto/keyinfo.c +1
-1@@ -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)) {Signature · 1 line
2.21.0.225.g810b269d1ac-goog
Actually I think we only need a data dependency barrier here, so this patch isn't needed. See discussion of similar case at
https://marc.info/?l=linux-fsdevel&m=155487269904655&w=2
- Eric