From: "Luís Henriques" <lhenriques@suse.de>
To: Jeff Layton <jlayton@kernel.org>, Xiubo Li <xiubli@redhat.com>,
Ilya Dryomov <idryomov@gmail.com>
Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
"Luís Henriques" <lhenriques@suse.de>
Subject: [RFC PATCH 1/2] ceph: add support for encrypted snapshot names
Date: Thu, 10 Mar 2022 17:26:15 +0000 [thread overview]
Message-ID: <20220310172616.16212-2-lhenriques@suse.de> (raw)
In-Reply-To: <20220310172616.16212-1-lhenriques@suse.de>
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 <lhenriques@suse.de>
---
fs/ceph/dir.c | 9 +++++++++
fs/ceph/inode.c | 13 +++++++++++++
2 files changed, 22 insertions(+)
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 6df2a91af236..123e3b9c8161 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1075,6 +1075,15 @@ static int ceph_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
op = CEPH_MDS_OP_MKSNAP;
dout("mksnap dir %p snap '%pd' dn %p\n", dir,
dentry, dentry);
+ /*
+ * Encrypted snapshots require d_revalidate to force a
+ * LOOKUPSNAP to cleanup dcache
+ */
+ if (IS_ENCRYPTED(dir)) {
+ spin_lock(&dentry->d_lock);
+ dentry->d_flags |= DCACHE_NOKEY_NAME;
+ spin_unlock(&dentry->d_lock);
+ }
} else if (ceph_snap(dir) == CEPH_NOSNAP) {
dout("mkdir dir %p dn %p mode 0%ho\n", dir, dentry, mode);
op = CEPH_MDS_OP_MKDIR;
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index b573a0f33450..81d3d554d261 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -182,6 +182,19 @@ 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 memory for fscrypt_auth in snapdir\n");
+ }
if (inode->i_state & I_NEW) {
inode->i_op = &ceph_snapdir_iops;
inode->i_fop = &ceph_snapdir_fops;
next prev parent reply other threads:[~2022-03-10 17:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 17:26 [RFC PATCH 0/2] Add support for snapshot names encryption Luís Henriques
2022-03-10 17:26 ` Luís Henriques [this message]
2022-03-12 8:30 ` [RFC PATCH 1/2] ceph: add support for encrypted snapshot names Xiubo Li
2022-03-14 2:45 ` Xiubo Li
2022-03-14 5:17 ` Xiubo Li
2022-03-14 11:07 ` Luís Henriques
2022-03-14 18:32 ` Luís Henriques
2022-03-15 7:28 ` Xiubo Li
2022-03-15 11:05 ` Luís Henriques
2022-03-10 17:26 ` [RFC PATCH 2/2] ceph: add support for handling encrypted snapshot names in subtree Luís Henriques
2022-03-14 8:54 ` Xiubo Li
2022-03-14 11:08 ` Luís Henriques
2022-03-10 17:34 ` [RFC PATCH 0/2] Add support for snapshot names encryption Luís Henriques
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220310172616.16212-2-lhenriques@suse.de \
--to=lhenriques@suse.de \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xiubli@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®