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 628E0C433F5 for ; Wed, 16 Mar 2022 00:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352743AbiCPAJX (ORCPT ); Tue, 15 Mar 2022 20:09:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352166AbiCPAJU (ORCPT ); Tue, 15 Mar 2022 20:09:20 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9A897BF5B for ; Tue, 15 Mar 2022 17:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647389282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PCFdOZxI4solGcrGUbRWwk0o4xvSLZiBmIOjrXXHesE=; b=NGtGwCh4l3tU7rHBM1JBrjuFIT1V2yBvNwuiY2UFLkLn014GzRCRMR/p3C0CvHeGsTY44i GSRnegR2LSgHt/LoAwdhrlMT1RwhwZa9dYdEDQatwel1fvpcYz3VQT/sVQim5FMNHUAaLG exhNXkBJZLqRacjmS1LGqo0yX5TFnXA= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-76-cNHvcKakNQ2wqb-CT1V69g-1; Tue, 15 Mar 2022 20:08:01 -0400 X-MC-Unique: cNHvcKakNQ2wqb-CT1V69g-1 Received: by mail-pj1-f69.google.com with SMTP id lr15-20020a17090b4b8f00b001c646e432baso1971612pjb.3 for ; Tue, 15 Mar 2022 17:08:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=PCFdOZxI4solGcrGUbRWwk0o4xvSLZiBmIOjrXXHesE=; b=c1br+BnIJSb6M9SilRfOhi8GOJP8dSdi32VxX9utFpps22i9MLS9exHDuOJwEWVPHH gPyJqM878R4gnTVwRFIj6FnQ+qt0AGZJgkO5ZjYpL6O8p69LveUe8356QvIBW21fM7Xr DlDoG3Uf/LtbXMHVyTLn3TcyvdgwqOkSAMPCqqdSEqPlezeo3+QzYA3xh+jETCDxnCDR NTwQcMjN7H0COnBz7njFyq+LNzJHIacQLZVPOdhjdksNiwwBKIzXCJJ98kkGYwvSFxRl NikEZbG2RA+EeGdpf0ZLeYs3BvUD5kGDSju3DpOpMEBqMCzXQon9EmUtIUWftofN3fL0 0zuQ== X-Gm-Message-State: AOAM533Fg3zSSxd4bXYY0isSdg8GqLgd/S3RRETxs1ngmVDqMhT1dkQB KvwZyku5fNpMmx6BOLvjfAbQv0h56U3YNoIQdIECYz2QFlFU3G8+m2YYtZ9dpaCucnwFepSX62h KeMB96wwkajlfFsKvr8xK+FNrrEcXU1psVnQe5E56EyUgWVRKYVRVAG5NNeHiJW4tsE3J+zyzgw == X-Received: by 2002:a63:f04f:0:b0:373:bd70:af2 with SMTP id s15-20020a63f04f000000b00373bd700af2mr26173244pgj.497.1647389280188; Tue, 15 Mar 2022 17:08:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzS4mf7yK4bBygxB0gR0dzVc38ESt/I83boPKsAH9Kd8PcoayeY3vqFLLDFpj4J+2h8hoPJtA== X-Received: by 2002:a63:f04f:0:b0:373:bd70:af2 with SMTP id s15-20020a63f04f000000b00373bd700af2mr26173232pgj.497.1647389279843; Tue, 15 Mar 2022 17:07:59 -0700 (PDT) Received: from [10.72.12.110] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id o5-20020a655bc5000000b00372f7ecfcecsm366556pgr.37.2022.03.15.17.07.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Mar 2022 17:07:59 -0700 (PDT) Subject: Re: [RFC PATCH v2 1/3] ceph: add support for encrypted snapshot names To: =?UTF-8?Q?Lu=c3=ads_Henriques?= , Jeff Layton , Ilya Dryomov Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220315161959.19453-1-lhenriques@suse.de> <20220315161959.19453-2-lhenriques@suse.de> From: Xiubo Li Message-ID: Date: Wed, 16 Mar 2022 08:07:52 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220315161959.19453-2-lhenriques@suse.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/16/22 12:19 AM, Luís Henriques wrote: > Since filenames in encrypted directories are already encrypted and shown > as a base64-encoded string when the directory is locked, snapshot names > should show a similar behaviour. > > Signed-off-by: Luís Henriques > --- > fs/ceph/inode.c | 31 +++++++++++++++++++++++++++---- > 1 file changed, 27 insertions(+), 4 deletions(-) > > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index 7b670e2405c1..359e29896f16 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -91,9 +91,15 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry, > if (err < 0) > goto out_err; > > - err = ceph_fscrypt_prepare_context(dir, inode, as_ctx); > - if (err) > - goto out_err; > + /* > + * We'll skip setting fscrypt context for snapshots, leaving that for > + * the handle_reply(). > + */ > + if (ceph_snap(dir) != CEPH_SNAPDIR) { > + err = ceph_fscrypt_prepare_context(dir, inode, as_ctx); > + if (err) > + goto out_err; > + } > > return inode; > out_err: > @@ -157,6 +163,7 @@ struct inode *ceph_get_snapdir(struct inode *parent) > }; > struct inode *inode = ceph_get_inode(parent->i_sb, vino, NULL); > struct ceph_inode_info *ci = ceph_inode(inode); > + int ret = -ENOTDIR; > > if (IS_ERR(inode)) > return inode; > @@ -182,6 +189,22 @@ struct inode *ceph_get_snapdir(struct inode *parent) > ci->i_rbytes = 0; > ci->i_btime = ceph_inode(parent)->i_btime; > > + /* if encrypted, just borrow fscrypt_auth from parent */ > + if (IS_ENCRYPTED(parent)) { > + struct ceph_inode_info *pci = ceph_inode(parent); > + > + ci->fscrypt_auth = kmemdup(pci->fscrypt_auth, > + pci->fscrypt_auth_len, > + GFP_KERNEL); > + if (ci->fscrypt_auth) { > + inode->i_flags |= S_ENCRYPTED; > + ci->fscrypt_auth_len = pci->fscrypt_auth_len; > + } else { > + dout("Failed to alloc snapdir fscrypt_auth\n"); > + ret = -ENOMEM; > + goto err; > + } > + } > if (inode->i_state & I_NEW) { > inode->i_op = &ceph_snapdir_iops; > inode->i_fop = &ceph_snapdir_fops; > @@ -195,7 +218,7 @@ struct inode *ceph_get_snapdir(struct inode *parent) > discard_new_inode(inode); > else > iput(inode); > - return ERR_PTR(-ENOTDIR); > + return ERR_PTR(ret); > } > > const struct inode_operations ceph_file_iops = { > LGTM. Reviewed-by: Xiubo Li