From: Pengpeng Hou <pengpeng@iscas.ac.cn>
To: Ilya Dryomov <idryomov@gmail.com>,
Alex Markuze <amarkuze@redhat.com>,
Viacheslav Dubeyko <slava@dubeyko.com>
Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
pengpeng@iscas.ac.cn
Subject: [PATCH] ceph: bound encrypted snapshot suffix formatting
Date: Fri, 3 Apr 2026 16:56:27 +0800 [thread overview]
Message-ID: <20260404101003.3-ceph-pengpeng@iscas.ac.cn> (raw)
`ceph_encode_encrypted_dname()` base64-encodes the encrypted snapshot
name into the caller buffer and then, for long snapshot names, appends
`_<ino>` with `sprintf(p + elen, ...)`.
Some callers only provide `NAME_MAX` bytes. For long snapshot names, the
returned length also includes the leading underscore that stays in place
ahead of the encoded text. On 64-bit kernels, a long inode suffix can
push the final encoded name past `NAME_MAX` even though the encrypted
prefix itself stayed within the documented 240-byte budget.
Format the suffix into a small local buffer first and reject names whose
suffix would exceed the caller's `NAME_MAX` output buffer.
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
fs/ceph/crypto.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
index f3de43ccb470..eeba8ffb0554 100644
--- a/fs/ceph/crypto.c
+++ b/fs/ceph/crypto.c
@@ -208,6 +208,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen)
struct ceph_client *cl = ceph_inode_to_client(parent);
struct inode *dir = parent;
char *p = buf;
+ char suffix[1 + 20 + 1];
u32 len;
int name_len = elen;
int ret;
@@ -271,8 +272,20 @@ int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen)
/* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */
WARN_ON(elen > 240);
- if (dir != parent) // leading _ is already there; append _<inum>
- elen += 1 + sprintf(p + elen, "_%ld", dir->i_ino);
+ if (dir != parent) { // leading _ is already there; append _<inum>
+ ret = snprintf(suffix, sizeof(suffix), "_%lu", dir->i_ino);
+ if (ret < 0) {
+ elen = ret;
+ goto out;
+ }
+ if (ret >= NAME_MAX - elen) {
+ elen = -ENAMETOOLONG;
+ goto out;
+ }
+
+ memcpy(p + elen, suffix, ret);
+ elen += ret + 1;
+ }
out:
kfree(cryptbuf);
--
2.50.1 (Apple Git-155)
next reply other threads:[~2026-04-04 8:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-03 8:56 Pengpeng Hou [this message]
2026-04-06 18:52 ` [PATCH] ceph: bound encrypted snapshot suffix formatting Viacheslav Dubeyko
2026-04-07 1:57 ` [PATCH v2] " Pengpeng Hou
2026-04-07 19:42 ` Viacheslav Dubeyko
2026-04-08 0:57 ` [PATCH v3] " Pengpeng Hou
2026-04-08 18:34 ` Viacheslav Dubeyko
2026-04-09 2:39 ` [PATCH v4] " Pengpeng Hou
2026-04-09 18:09 ` Viacheslav Dubeyko
2026-04-10 20:40 ` Viacheslav Dubeyko
2026-04-10 20:46 ` Viacheslav Dubeyko
2026-04-22 9:53 ` Ilya Dryomov
2026-04-23 18:04 ` Viacheslav Dubeyko
2026-04-24 9:27 ` Ilya Dryomov
2026-04-24 18:31 ` Viacheslav Dubeyko
2026-04-24 19:20 ` Ilya Dryomov
2026-04-27 8:12 ` Luis Henriques
2026-04-28 11:40 ` Ilya Dryomov
2026-04-28 18:17 ` Viacheslav Dubeyko
2026-04-24 8:15 ` Luis Henriques
2026-04-07 3:30 ` [PATCH] " Pengpeng Hou
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=20260404101003.3-ceph-pengpeng@iscas.ac.cn \
--to=pengpeng@iscas.ac.cn \
--cc=amarkuze@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=slava@dubeyko.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