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: 14950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp606772wru; Thu, 3 Nov 2022 08:38:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5EVbbawSmbdzD/jogPC97+yKvskrq104bXCLnmVuOek/Hu/j3Gd87FIch5A3cVb01iYBcQ X-Received: by 2002:a17:906:f149:b0:7ad:e210:690e with SMTP id gw9-20020a170906f14900b007ade210690emr18727409ejb.427.1667489939596; Thu, 03 Nov 2022 08:38:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667489939; cv=none; d=google.com; s=arc-20160816; b=VLQoq1DlTeqptSURyi2AWtRT1iTjQ+euOwJwfCTbhnGdJl0ufrdGmztwu/YbtF3PXv 7pfp+z+bTBU6/d33/+bSzPdHNne2ziBaiLZW1WEQHHeWtNOPVqdCC1hcmYH6Z6m5Xjeh k18I/We7UqLoyTw3+P4bhf3gIUB0kcjWHIEneheLs7nwRwBcnvP99LDFO+09ir3YqVrh PYTb48yuv8wHSmadJhV3uUWBWvOyyYD9UlrHpOSeIlofW0UdIY1Fq3w3efZcBq30XWWl Y/3LbPD9YoMJos64Dy5RlMc9HE1a91Any+EL8tirkYdHQmBKYRCiBQ8fGP7gdZlAHQ8X zarg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=3h//HlIguXJZhRdiiWfRY76v7ffmrOuFdbIoPsc2yf0=; b=TGCsn2X23jlc3FJUSPUsHlIJ+bogs1ynSOMQjHSyQPNi58HDHqsInV94ax4UP9bpwm mwDhaxrjSWCTbWnwMeYjxKbSOPq91p7ff5pgSTeHW5nDu7hEtslcWfDt7f61tAJit0SN 4Y+eEfMZ8sDGlFWJcCNm32Os+8l7LlwJvM3kXKKlIabD5NO3DkmNOlGdDexhY2KIMVqs pOLVefZOJxApXez08y8Jg6gDi+BYl4LdAKN5nnUKYsCIfA2RRJ3sSoGWMeAWEkovOQuH PgTXI1ez5asFlwkpUBwfpJhXjsoZahWY7skOokDUMOUnAtLqaZ0UMhxq0iLTW5v08/HQ BbRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vMI7YSyD; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j27-20020a170906279b00b0078d9f1f72bcsi1204141ejc.726.2022.11.03.08.38.32; Thu, 03 Nov 2022 08:38:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vMI7YSyD; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231320AbiKCPf2 (ORCPT + 99 others); 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748489930805013486?= X-GMAIL-MSGID: =?utf-8?q?1748489930805013486?= 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: