From patchwork Thu Nov 3 15:36:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 13030439 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 8F7C4C4332F for ; Thu, 3 Nov 2022 15:35:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231169AbiKCPf2 (ORCPT ); Thu, 3 Nov 2022 11:35:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbiKCPf1 (ORCPT ); Thu, 3 Nov 2022 11:35:27 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2903A12618; Thu, 3 Nov 2022 08:35:27 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DB29F1F385; Thu, 3 Nov 2022 15:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1667489725; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3h//HlIguXJZhRdiiWfRY76v7ffmrOuFdbIoPsc2yf0=; b=vMI7YSyDMTLJWTmD4jWd5L2nt96lEOeopCxI4R38AQcxm0l7hX8wMjBKICrSJArEczGuNk Lc9HM8vv6+c4i+EKit6cHdgc4y6+3E9hHjOoZ4IxjjhUX+AjyPPToyyE7s/Lmnlb5hNlVD PytEXPlL9XQHYRObkHF/3nkn3/lWgfQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1667489725; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3h//HlIguXJZhRdiiWfRY76v7ffmrOuFdbIoPsc2yf0=; b=fZ33pnkYNIh7EzdZMBC7XhcXM9L3Gw5ajU3mgQfSTDn2XyY+NIJwbocyW0MEY2ziMgCH+L qb16Aqp2AuSlZ2CQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 763D913480; Thu, 3 Nov 2022 15:35:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id JZ/kGb3fY2N/JgAAMHmgww (envelope-from ); Thu, 03 Nov 2022 15:35:25 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 3d1d2e61; Thu, 3 Nov 2022 15:36:25 +0000 (UTC) From: =?utf-8?q?Lu=C3=ADs_Henriques?= To: Xiubo Li , Ilya Dryomov , Jeff Layton Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Lu?= =?utf-8?q?=C3=ADs_Henriques?= Subject: [PATCH] ceph: fix memory leak in mount error path when using test_dummy_encryption Date: Thu, 3 Nov 2022 15:36:19 +0000 Message-Id: <20221103153619.11068-1-lhenriques@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Because ceph_init_fs_context() will never be invoced in case we get a mount error, destroy_mount_options() won't be releasing fscrypt resources with fscrypt_free_dummy_policy(). This will result in a memory leak. Add an invocation to this function in the mount error path. Signed-off-by: Luís Henriques --- fs/ceph/super.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 2224d44d21c0..6b9fd04b25cd 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1362,6 +1362,7 @@ static int ceph_get_tree(struct fs_context *fc) ceph_mdsc_close_sessions(fsc->mdsc); deactivate_locked_super(sb); + fscrypt_free_dummy_policy(&fsc->fsc_dummy_enc_policy); goto out_final; out: