* [PATCH AUTOSEL 5.15 5/6] fs/super.c: stop calling fscrypt_destroy_keyring() from __put_super()
[not found] <20230226034359.773806-1-sashal@kernel.org>
@ 2023-02-26 3:43 ` Sasha Levin
0 siblings, 0 replies; only message in thread
From: Sasha Levin @ 2023-02-26 3:43 UTC (permalink / raw)
To: linux-kernel, stable; +Cc: Eric Biggers, Sasha Levin, viro, linux-fsdevel
From: Eric Biggers <ebiggers@google.com>
[ Upstream commit ec64036e68634231f5891faa2b7a81cdc5dcd001 ]
Now that the key associated with the "test_dummy_operation" mount option
is added on-demand when it's needed, rather than immediately when the
filesystem is mounted, fscrypt_destroy_keyring() no longer needs to be
called from __put_super() to avoid a memory leak on mount failure.
Remove this call, which was causing confusion because it appeared to be
a sleep-in-atomic bug (though it wasn't, for a somewhat-subtle reason).
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230208062107.199831-5-ebiggers@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/super.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/super.c b/fs/super.c
index 7fa3ee79ec898..4eeb0b47412ae 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -293,7 +293,6 @@ static void __put_super(struct super_block *s)
WARN_ON(s->s_inode_lru.node);
WARN_ON(!list_empty(&s->s_mounts));
security_sb_free(s);
- fscrypt_destroy_keyring(s);
put_user_ns(s->s_user_ns);
kfree(s->s_subtype);
call_rcu(&s->rcu, destroy_super_rcu);
--
2.39.0
^ permalink raw reply related [flat|nested] only message in thread