Message ID | 20221108143421.30993-1-lhenriques@suse.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2744764wru; Tue, 8 Nov 2022 06:34:15 -0800 (PST) X-Google-Smtp-Source: AMsMyM40fLO1F0GJMezYdVVN4Ggkv93j6C2iAP6vEmxApTqcimvtCXHiE3SVFFKJyxNmLAqBDtHa X-Received: by 2002:a17:902:e14d:b0:186:898a:f33d with SMTP id d13-20020a170902e14d00b00186898af33dmr1029546pla.33.1667918055297; Tue, 08 Nov 2022 06:34:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667918055; cv=none; d=google.com; s=arc-20160816; b=GVwO313B4/PhdokNWB8imto2k47l/cc5cRRTOJgJShEiwF32ihtr4gNtqXWgu0kpK+ JUciBme+XxAS8iOOlGjVuucB4xqr0yIMMkKh8xniHKNWvUR1SbVv+eStR+Ktd41RKGjh LekCIwqoECRDD7FVoXKKF4lQkB2OYgAvliGjVge2z10qnlX4k00EKPxI3p/D2uLhe2k4 lMnWInbFr0otpHEVGoqI/bkpbA3Ypd2966tpWPYBY6evVuh0vGlgCSFqRgNkFhgQvwzq gtoGRXwXX/tbq59178AB0tT6/RbIveXnTwAunjY0LAQ/ip7yta8aBTSB5i/V9ry6HZX6 P08Q== 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=bsCWcDyBc5BTfKnK5tb7UxOWSDPa58fCHAcnTLeBXms=; b=0+4AVBSY3vy1eRW+ylUIL6KHWCkrQxASs6VYZD33Te46ZJFV154l0GOoCN0YQYIgJ2 nQysVtCU0mUQmVWG3Uk4m2slqT3c2SoRmbNcIp4mNDVI0PjCtrLxJXelDdcXPt9AejlJ CERMrmAw51amjP7mCN6YjKb9LBrNH7XekMR7JSacntT9/g8cHM1kUW2VVXdCVM42N+oT Q+G+Q2ZJZBvbcBtiK5rc/cTNMvpmFRneyf39hoV4jVPHSH+5HWp4qv/DWrW/ASXtqSX+ 8lK+mgV98TwNYui8cGuVQXipc+liA5EQQCDdM5kkaFmFkuoCev/IAD46SGVaFh2BSFsW fr3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=y+2nS0vK; dkim=neutral (no key) header.i=@suse.de; 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 a15-20020a170902eccf00b00186be05c702si16131926plh.530.2022.11.08.06.34.00; Tue, 08 Nov 2022 06:34:15 -0800 (PST) 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=y+2nS0vK; dkim=neutral (no key) header.i=@suse.de; 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 S234188AbiKHOdq (ORCPT <rfc822;tony84727@gmail.com> + 99 others); Tue, 8 Nov 2022 09:33:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233938AbiKHOdZ (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 8 Nov 2022 09:33:25 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6D22CEB; Tue, 8 Nov 2022 06:33:24 -0800 (PST) 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 359631F8E3; Tue, 8 Nov 2022 14:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1667918003; 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=bsCWcDyBc5BTfKnK5tb7UxOWSDPa58fCHAcnTLeBXms=; b=y+2nS0vKe7LmELq2vRSmSOEf/AMQtUENZ5rsieWBjEqNWWKUIZgnlhq6h2c3S0QX4n1Mfw CAOSFDuMOKWYaHURp3/q1w1cBob1r5n1jNnhkazpheK4Pdiy1DPJr63XxU4cN3ZrHvYDZ+ KgciMrp9LQTL0cdyTC+1SRJMKiGuFiI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1667918003; 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=bsCWcDyBc5BTfKnK5tb7UxOWSDPa58fCHAcnTLeBXms=; b=jyLT7Vu1KKl0H4Nq4QzbhAEQEx/lhP1iUiYdPGzAfLNBQkoilo1/c8RYXDq5xs+w//XF/h gNT7ffrXs8GE+gDw== 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 C53B313398; Tue, 8 Nov 2022 14:33:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id bPopLbJoamPyMgAAMHmgww (envelope-from <lhenriques@suse.de>); Tue, 08 Nov 2022 14:33:22 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 59105061; Tue, 8 Nov 2022 14:34:23 +0000 (UTC) From: =?utf-8?q?Lu=C3=ADs_Henriques?= <lhenriques@suse.de> To: Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>, Jeff Layton <jlayton@kernel.org> Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Lu?= =?utf-8?q?=C3=ADs_Henriques?= <lhenriques@suse.de> Subject: [PATCH v2] ceph: fix memory leak in mount error path when using test_dummy_encryption Date: Tue, 8 Nov 2022 14:34:21 +0000 Message-Id: <20221108143421.30993-1-lhenriques@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748938842719504419?= X-GMAIL-MSGID: =?utf-8?q?1748938842719504419?= |
Series |
[v2] ceph: fix memory leak in mount error path when using test_dummy_encryption
|
|
Commit Message
Luis Henriques
Nov. 8, 2022, 2:34 p.m. UTC
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 <lhenriques@suse.de>
---
* Changes since v1:
As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to
ceph_real_mount().
(Also used 'git format-patch' with '--base' so that the bots know what to
(not) do with this patch.)
fs/ceph/super.c | 1 +
1 file changed, 1 insertion(+)
base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be
prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa
prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624
prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e
Comments
On 08/11/2022 22:34, Luís Henriques wrote: > 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 <lhenriques@suse.de> > --- > * Changes since v1: > > As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to > ceph_real_mount(). > > (Also used 'git format-patch' with '--base' so that the bots know what to > (not) do with this patch.) > > fs/ceph/super.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/ceph/super.c b/fs/ceph/super.c > index 2224d44d21c0..f10a076f47e5 100644 > --- a/fs/ceph/super.c > +++ b/fs/ceph/super.c > @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, > > out: > mutex_unlock(&fsc->client->mount_mutex); > + ceph_fscrypt_free_dummy_policy(fsc); > return ERR_PTR(err); > } > > > base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be > prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa > prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 > prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e > LGTM. Thanks Luis. Could I fold this into the previous commit ? BRs - Xiubo
On Wed, Nov 09, 2022 at 11:08:49AM +0800, Xiubo Li wrote: > > On 08/11/2022 22:34, Luís Henriques wrote: > > 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 <lhenriques@suse.de> > > --- > > * Changes since v1: > > > > As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to > > ceph_real_mount(). > > > > (Also used 'git format-patch' with '--base' so that the bots know what to > > (not) do with this patch.) > > > > fs/ceph/super.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/fs/ceph/super.c b/fs/ceph/super.c > > index 2224d44d21c0..f10a076f47e5 100644 > > --- a/fs/ceph/super.c > > +++ b/fs/ceph/super.c > > @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, > > out: > > mutex_unlock(&fsc->client->mount_mutex); > > + ceph_fscrypt_free_dummy_policy(fsc); > > return ERR_PTR(err); > > } > > > > base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be > > prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa > > prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 > > prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e > > > LGTM. > > Thanks Luis. > > Could I fold this into the previous commit ? Yes, sure. I'm fine with that. Cheers, -- Luís
On 09/11/2022 17:33, Luís Henriques wrote: > On Wed, Nov 09, 2022 at 11:08:49AM +0800, Xiubo Li wrote: >> On 08/11/2022 22:34, Luís Henriques wrote: >>> 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 <lhenriques@suse.de> >>> --- >>> * Changes since v1: >>> >>> As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to >>> ceph_real_mount(). >>> >>> (Also used 'git format-patch' with '--base' so that the bots know what to >>> (not) do with this patch.) >>> >>> fs/ceph/super.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/fs/ceph/super.c b/fs/ceph/super.c >>> index 2224d44d21c0..f10a076f47e5 100644 >>> --- a/fs/ceph/super.c >>> +++ b/fs/ceph/super.c >>> @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, >>> out: >>> mutex_unlock(&fsc->client->mount_mutex); >>> + ceph_fscrypt_free_dummy_policy(fsc); >>> return ERR_PTR(err); >>> } >>> >>> base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be >>> prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa >>> prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 >>> prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e >>> >> LGTM. >> >> Thanks Luis. >> >> Could I fold this into the previous commit ? > Yes, sure. I'm fine with that. Thanks. I will mentioned this fix in that commit comments. - Xiubo > > Cheers, > -- > Luís >
Hi Luis, Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291. Currently I only applied it into the 'testing' branch. Thanks! - Xiubo On 09/11/2022 17:33, Luís Henriques wrote: > On Wed, Nov 09, 2022 at 11:08:49AM +0800, Xiubo Li wrote: >> On 08/11/2022 22:34, Luís Henriques wrote: >>> 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 <lhenriques@suse.de> >>> --- >>> * Changes since v1: >>> >>> As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to >>> ceph_real_mount(). >>> >>> (Also used 'git format-patch' with '--base' so that the bots know what to >>> (not) do with this patch.) >>> >>> fs/ceph/super.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/fs/ceph/super.c b/fs/ceph/super.c >>> index 2224d44d21c0..f10a076f47e5 100644 >>> --- a/fs/ceph/super.c >>> +++ b/fs/ceph/super.c >>> @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, >>> out: >>> mutex_unlock(&fsc->client->mount_mutex); >>> + ceph_fscrypt_free_dummy_policy(fsc); >>> return ERR_PTR(err); >>> } >>> >>> base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be >>> prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa >>> prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 >>> prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e >>> >> LGTM. >> >> Thanks Luis. >> >> Could I fold this into the previous commit ? > Yes, sure. I'm fine with that. > > Cheers, > -- > Luís >
On Wed, Nov 09, 2022 at 05:57:41PM +0800, Xiubo Li wrote: > Hi Luis, > > Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291. Ugh! That's quite confusing :-) I did a 'git fetch' and looked into commit 205efda80b67 ("ceph: implement -o test_dummy_encryption mount option") instead, and compared it with it's version in the wip-fscrypt branch. It looks good to me: the only difference I see is my fix (adding the 'ceph_fscrypt_free_dummy_policy' call to 'ceph_real_mount'). Thanks! Cheers, -- Luís > > Currently I only applied it into the 'testing' branch. > > Thanks! > > - Xiubo > > > On 09/11/2022 17:33, Luís Henriques wrote: > > On Wed, Nov 09, 2022 at 11:08:49AM +0800, Xiubo Li wrote: > > > On 08/11/2022 22:34, Luís Henriques wrote: > > > > 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 <lhenriques@suse.de> > > > > --- > > > > * Changes since v1: > > > > > > > > As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to > > > > ceph_real_mount(). > > > > > > > > (Also used 'git format-patch' with '--base' so that the bots know what to > > > > (not) do with this patch.) > > > > > > > > fs/ceph/super.c | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/fs/ceph/super.c b/fs/ceph/super.c > > > > index 2224d44d21c0..f10a076f47e5 100644 > > > > --- a/fs/ceph/super.c > > > > +++ b/fs/ceph/super.c > > > > @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, > > > > out: > > > > mutex_unlock(&fsc->client->mount_mutex); > > > > + ceph_fscrypt_free_dummy_policy(fsc); > > > > return ERR_PTR(err); > > > > } > > > > > > > > base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be > > > > prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa > > > > prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 > > > > prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e > > > > > > > LGTM. > > > > > > Thanks Luis. > > > > > > Could I fold this into the previous commit ? > > Yes, sure. I'm fine with that. > > > > Cheers, > > -- > > Luís > > >
On 09/11/2022 18:38, Luís Henriques wrote: > On Wed, Nov 09, 2022 at 05:57:41PM +0800, Xiubo Li wrote: >> Hi Luis, >> >> Please check https://github.com/ceph/ceph-client/commit/205efda80b6759a741dde209a7158a5bbf044d23#diff-eb62c69f842ed95a7d047262a62946b07eda52f2ea49ae33c39ea13754dfc291. > Ugh! That's quite confusing :-) > > I did a 'git fetch' and looked into commit 205efda80b67 ("ceph: implement > -o test_dummy_encryption mount option") instead, and compared it with it's > version in the wip-fscrypt branch. It looks good to me: the only > difference I see is my fix (adding the 'ceph_fscrypt_free_dummy_policy' > call to 'ceph_real_mount'). Thanks! I will update the wip-fscrypt branch later. Thanks! > Cheers, > -- > Luís > >> Currently I only applied it into the 'testing' branch. >> >> Thanks! >> >> - Xiubo >> >> >> On 09/11/2022 17:33, Luís Henriques wrote: >>> On Wed, Nov 09, 2022 at 11:08:49AM +0800, Xiubo Li wrote: >>>> On 08/11/2022 22:34, Luís Henriques wrote: >>>>> 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 <lhenriques@suse.de> >>>>> --- >>>>> * Changes since v1: >>>>> >>>>> As suggested by Xiubo, moved fscrypt free from ceph_get_tree() to >>>>> ceph_real_mount(). >>>>> >>>>> (Also used 'git format-patch' with '--base' so that the bots know what to >>>>> (not) do with this patch.) >>>>> >>>>> fs/ceph/super.c | 1 + >>>>> 1 file changed, 1 insertion(+) >>>>> >>>>> diff --git a/fs/ceph/super.c b/fs/ceph/super.c >>>>> index 2224d44d21c0..f10a076f47e5 100644 >>>>> --- a/fs/ceph/super.c >>>>> +++ b/fs/ceph/super.c >>>>> @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, >>>>> out: >>>>> mutex_unlock(&fsc->client->mount_mutex); >>>>> + ceph_fscrypt_free_dummy_policy(fsc); >>>>> return ERR_PTR(err); >>>>> } >>>>> >>>>> base-commit: 8b9ee21dfceadd4cc35a87bbe7f0ad547cffa1be >>>>> prerequisite-patch-id: 34ba9e6b37b68668d261ddbda7858ee6f83c82fa >>>>> prerequisite-patch-id: 87f1b323c29ab8d0a6d012d30fdc39bc49179624 >>>>> prerequisite-patch-id: c94f448ef026375b10748457a3aa46070aa7046e >>>>> >>>> LGTM. >>>> >>>> Thanks Luis. >>>> >>>> Could I fold this into the previous commit ? >>> Yes, sure. I'm fine with that. >>> >>> Cheers, >>> -- >>> Luís >>>
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 2224d44d21c0..f10a076f47e5 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1196,6 +1196,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, out: mutex_unlock(&fsc->client->mount_mutex); + ceph_fscrypt_free_dummy_policy(fsc); return ERR_PTR(err); }