From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCD7CC7EE33 for ; Sun, 26 Feb 2023 03:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229617AbjBZDmt (ORCPT ); Sat, 25 Feb 2023 22:42:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbjBZDmk (ORCPT ); Sat, 25 Feb 2023 22:42:40 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 851FD166F5; Sat, 25 Feb 2023 19:42:16 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90B7460B9E; Sun, 26 Feb 2023 03:42:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50856C4339C; Sun, 26 Feb 2023 03:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677382934; bh=V1V8+G+G5iNBb2DJoIl9TXX/jDls+LzpkUNZODYywrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jY+fYYXibO/ITDFEWcNpRcXOZvYD+DAbUrArD0NJBXUkhSAtt/dfEn2GKbaSMQ/8W mJfiXxaFvKOMVl5GNitoe9MTEvpBBH0e8fi4vMYE7mmTA21AO7f55OTNyJncg8NDkF VPwCBrfcetVCOzbSbf2rHIpiPR7dO/rrwjv8JPEGNsjcFyI24hALncgUHauOWO/9fq drUcTAFzWRlXAQV/NGtYfPHAL81wEwin6DKhWFvbVUgBZi49KQMPobI4SGzFcwTlaS MQEdeq11kcaTnUhgvZWkJX3plzsL/bo8FFXo0q6gMTL+lW0DCYDsCjzrzBrwvdHYJq ILaHl8eojx+Pg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Biggers , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 12/21] fs/super.c: stop calling fscrypt_destroy_keyring() from __put_super() Date: Sat, 25 Feb 2023 22:41:41 -0500 Message-Id: <20230226034150.771411-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226034150.771411-1-sashal@kernel.org> References: <20230226034150.771411-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Eric Biggers [ 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 Link: https://lore.kernel.org/r/20230208062107.199831-5-ebiggers@kernel.org Signed-off-by: Sasha Levin --- fs/super.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/super.c b/fs/super.c index cf737ec2bd05c..8e531174e7c28 100644 --- a/fs/super.c +++ b/fs/super.c @@ -291,7 +291,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