imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-31 06:14:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fscrypt: clear keyring before calling key_put()

Browse Source 
Now that the key quotas are handled immediately on key_put() instead of
being postponed to the key management garbage collection worker, a call
to keyring_clear() is all that is required in fscrypt_put_master_key()
so that the keyring clean-up is also done synchronously.  This patch
should fix the fstest generic/581 flakiness.

Signed-off-by: Luis Henriques <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
[ebiggers: added comment]
Signed-off-by: Eric Biggers <[email protected]>
This commit is contained in:
Luis Henriques authored and Eric Biggers committed 2024-02-06 16:55:35 -08:00
1 parent 5befc19cae
commit d3a7bd4200
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
fs/crypto/keyring.c
+6 -2
View File
@@ -74,8 +74,12 @@ void fscrypt_put_master_key(struct fscrypt_master_key *mk)
* that concurrent keyring lookups can no longer find it.
*/
WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 0);
key_put(mk->mk_users);
mk->mk_users = NULL;
if (mk->mk_users) {
/* Clear the keyring so the quota gets released right away. */
keyring_clear(mk->mk_users);
key_put(mk->mk_users);
mk->mk_users = NULL;
}
call_rcu(&mk->mk_rcu_head, fscrypt_free_master_key);
}