diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
| commit | d60ac92c105fd8c09224b92c3e34dd03327ba3f4 (patch) | |
| tree | b1c3ef3f277aa48370f590341166d4425b30cab6 /fs/crypto/hooks.c | |
| parent | a769648f464c9f453b3dc5c2bb8559b28c5d78a1 (diff) | |
| parent | 19591f7e781fd1e68228f5b3bee60be6425af886 (diff) | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"Make fs/crypto/ use the HMAC-SHA512 library functions instead of
crypto_shash.
This is simpler, faster, and more reliable"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: use HMAC-SHA512 library for HKDF
fscrypt: Remove redundant __GFP_NOWARN
Diffstat (limited to 'fs/crypto/hooks.c')
| -rw-r--r-- | fs/crypto/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c index 7a5d4c168c49..b97de0d1430f 100644 --- a/fs/crypto/hooks.c +++ b/fs/crypto/hooks.c @@ -205,7 +205,7 @@ int fscrypt_prepare_setflags(struct inode *inode, mk = ci->ci_master_key; down_read(&mk->mk_sem); if (mk->mk_present) - err = fscrypt_derive_dirhash_key(ci, mk); + fscrypt_derive_dirhash_key(ci, mk); else err = -ENOKEY; up_read(&mk->mk_sem); |