FAILED: patch "[PATCH] ceph: fix refcount leak in ceph_readdir()" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x c3e64079d8b9663e3998d0caac9aba915b6b93ae
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072936-dispersal-unwanted-0d62@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c3e64079d8b9663e3998d0caac9aba915b6b93ae Mon Sep 17 00:00:00 2001
From: WenTao Liang <[email protected]>
Date: Thu, 11 Jun 2026 22:40:07 +0800
Subject: [PATCH] ceph: fix refcount leak in ceph_readdir()
The ceph_readdir() function allocates a ceph_mds_request via ceph_mdsc_create_request() and stores it in dfi->last_readdir. In the directory entry processing loop, if the entry's offset is less than ctx->pos or if the inode pointer is unexpectedly NULL, the function returns -EIO without releasing the reference held by dfi->last_readdir, causing a refcount leak.
Fix this by adding ceph_mdsc_put_request(dfi->last_readdir) before returning on these error paths. Also set dfi->last_readdir to NULL for safety, matching the cleanup done at the normal exit.
fs/ceph/dir.c +6 -1
@@ -546,11 +546,16 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)pr_warn_client (cl,"%p %llx.%llx rde->offset 0x%llx ctx->pos 0x%llx\n" , inode,ceph_vinop (inode), rde->offset, ctx->pos); +ceph_mdsc_put_request (dfi->last_readdir); + dfi->last_readdir =NULL ;return -EIO ; } -if (WARN_ON_ONCE (!rde->inode.in)) +if (WARN_ON_ONCE (!rde->inode.in)) { +ceph_mdsc_put_request (dfi->last_readdir); + dfi->last_readdir =NULL ;return -EIO ; + } ctx->pos = rde->offset; doutc(cl, "%p %llx.%llx (%d/%d) -> %llx '%.*s' %p\n", inode,
Sasha Levin
maintainerPATCH 1/3 libceph: add doutc and *_client debug macros support
From: Xiubo Li <[email protected]>
[ Upstream commit 5c5f0d2b5f92c47baf82b9b211e27edd7d195158 ]
This will help print the fsid and client's global_id in debug logs, and also print the function names.
[ idryomov: %lld -> %llu, leading space for doutc(), don't include
__func__ in pr_*() variants ]
Stable-dep-of: c3e64079d8b9 ("ceph: fix refcount leak in ceph_readdir()")
--- include/linux/ceph/ceph_debug.h | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
include/linux/ceph/ceph_debug.h +38 -0
@@ -19,12 +19,25 @@pr_debug ("%.*s %12.12s:%-4d : " fmt, \8 - (int )sizeof (KBUILD_MODNAME )," " , \ kbasename(__FILE__), __LINE__, ##__VA_ARGS__) +# define doutc (client, fmt, ...) \ + pr_debug("%.*s %12.12s:%-4d : [%pU %llu] " fmt, \ + 8 - (int)sizeof(KBUILD_MODNAME), " ", \ + kbasename(__FILE__), __LINE__, \ + &client->fsid, client->monc.auth->global_id, \ + ##__VA_ARGS__)# else /* faux printk call just to see any compiler warnings. */ # define dout (fmt, ...) do { \ if (0) \ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) +# define doutc (client, fmt, ...) do { \ + if (0) \ + printk(KERN_DEBUG "[%pU %llu] " fmt, \ + &client->fsid, \ + client->monc.auth->global_id, \ + ##__VA_ARGS__); \ + } while (0)# endif #else
@@ -33,7 +46,32 @@* or, just wrap pr_debug */ # define dout (fmt, ...) pr_debug(" " fmt, ##__VA_ARGS__) +# define doutc (client, fmt, ...) \ + pr_debug(" [%pU %llu] %s: " fmt, &client->fsid, \ + client->monc.auth->global_id, __func__, ##__VA_ARGS__)#endif +#define pr_notice_client (client, fmt, ...) \ + pr_notice("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_info_client (client, fmt, ...) \ + pr_info("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_warn_client (client, fmt, ...) \ + pr_warn("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_warn_once_client (client, fmt, ...) \ + pr_warn_once("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_err_client (client, fmt, ...) \ + pr_err("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_warn_ratelimited_client (client, fmt, ...) \ + pr_warn_ratelimited("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#define pr_err_ratelimited_client (client, fmt, ...) \ + pr_err_ratelimited("[%pU %llu]: " fmt, &client->fsid, \ + client->monc.auth->global_id, ##__VA_ARGS__) +#endif
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 ceph: print cluster fsid and client global_id in all debug logs
From: Xiubo Li <[email protected]>
[ Upstream commit 38d46409c4639a1d659ebfa70e27a8bed6b8ee1d ]
Multiple CephFS mounts on a host is increasingly common so disambiguating messages like this is necessary and will make it easier to debug issues.
At the same this will improve the debug logs to make them easier to troubleshooting issues, such as print the ino# instead only printing the memory addresses of the corresponding inodes and print the dentry names instead of the corresponding memory addresses for the dentry,etc.
Stable-dep-of: c3e64079d8b9 ("ceph: fix refcount leak in ceph_readdir()")
--- fs/ceph/acl.c | 6 +- fs/ceph/addr.c | 279 +++++++++-------- fs/ceph/caps.c | 710 +++++++++++++++++++++++++------------------ fs/ceph/crypto.c | 39 ++- fs/ceph/debugfs.c | 6 +- fs/ceph/dir.c | 218 +++++++------ fs/ceph/export.c | 39 +-- fs/ceph/file.c | 245 ++++++++------- fs/ceph/inode.c | 485 ++++++++++++++++------------- fs/ceph/ioctl.c | 13 +- fs/ceph/locks.c | 57 ++-- fs/ceph/mds_client.c | 554 ++++++++++++++++++--------------- fs/ceph/mdsmap.c | 24 +- fs/ceph/metric.c | 5 +- fs/ceph/quota.c | 29 +- fs/ceph/snap.c | 174 ++++++----- fs/ceph/super.c | 70 +++-- fs/ceph/super.h | 6 + fs/ceph/xattr.c | 96 +++--- 19 files changed, 1745 insertions(+), 1310 deletions(-)
fs/ceph/acl.c +4 -2
@@ -15,6 +15,7 @@#include <linux/slab.h> #include "super.h" +#include "mds_client.h" static inline void ceph_set_cached_acl (struct inode *inode,int type,struct posix_acl *acl)
@@ -31,6 +32,7 @@ static inline void ceph_set_cached_acl(struct inode *inode,struct posix_acl *ceph_get_acl (struct inode *inode,int type,bool rcu) { +struct ceph_client *cl =ceph_inode_to_client (inode);int size;unsigned int retry_cnt =0 ;const char *name;
@@ -72,8 +74,8 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu) }else if (size == -ENODATA || size ==0 ) { acl =NULL ; }else { -pr_err_ratelimited ("get acl %llx.%llx failed, err=%d\n" , -ceph_vinop (inode), size); +pr_err_ratelimited_client (cl,"%llx.%llx failed, err=%d\n" , +ceph_vinop (inode), size); acl =ERR_PTR (-EIO ); }
fs/ceph/addr.c +153 -126
757 lines not on this page · raw message
fs/ceph/caps.c +410 -300
1,717 lines not on this page · raw message
fs/ceph/crypto.c +26 -13
@@ -211,6 +211,7 @@ void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,static struct inode *parse_longname (const struct inode *parent,const char *name,int *name_len) { +struct ceph_client *cl =ceph_inode_to_client (parent);struct inode *dir =NULL ;struct ceph_vino vino = { .snap =CEPH_NOSNAP };char *inode_number;
@@ -222,12 +223,12 @@ static struct inode *parse_longname(const struct inode *parent, name++; name_end =strrchr (name,'_' );if (!name_end) { -dout ("Failed to parse long snapshot name: %s\n" , name); +doutc (cl,"failed to parse long snapshot name: %s\n" , name);return ERR_PTR (-EIO ); } *name_len = (name_end - name);if (*name_len <=0 ) { -pr_err ("Failed to parse long snapshot name\n" ); +pr_err_client (cl,"failed to parse long snapshot name\n" );return ERR_PTR (-EIO ); }
@@ -239,7 +240,7 @@ static struct inode *parse_longname(const struct inode *parent,return ERR_PTR (-ENOMEM ); ret =kstrtou64 (inode_number,10 , &vino.ino);if (ret) { -dout ("Failed to parse inode number: %s\n" , name); +doutc (cl,"failed to parse inode number: %s\n" , name); dir =ERR_PTR (ret); goto out; }
@@ -250,7 +251,7 @@ static struct inode *parse_longname(const struct inode *parent,/* This can happen if we're not mounting cephfs on the root */ dir =ceph_get_inode (parent->i_sb, vino,NULL );if (IS_ERR (dir)) -dout ("Can't find inode %s (%s)\n" , inode_number, name); +doutc (cl,"can't find inode %s (%s)\n" , inode_number, name); } out:
@@ -261,6 +262,7 @@ static struct inode *parse_longname(const struct inode *parent,int ceph_encode_encrypted_dname (struct inode *parent,struct qstr *d_name,char *buf) { +struct ceph_client *cl =ceph_inode_to_client (parent);struct inode *dir = parent;struct qstr iname;u32 len;
@@ -329,7 +331,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,/* base64 encode the encrypted name */ elen =ceph_base64_encode (cryptbuf, len, buf); -dout ("base64-encoded ciphertext name = %.*s\n" , elen, buf); +doutc (cl,"base64-encoded ciphertext name = %.*s\n" , elen, buf);/* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */ WARN_ON (elen >240 );
@@ -504,7 +506,10 @@ int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode, struct page *page, unsigned int len, unsigned int offs, u64 lblk_num) { - dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num); + struct ceph_client *cl = ceph_inode_to_client(inode); + +doutc (cl,"%p %llx.%llx len %u offs %u blk %llu\n" , inode, +ceph_vinop (inode), len, offs, lblk_num);return fscrypt_decrypt_block_inplace (inode, page, len, offs, lblk_num); }
@@ -513,7 +518,10 @@ int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode, unsigned int offs, u64 lblk_num, gfp_t gfp_flags) { - dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num); + struct ceph_client *cl = ceph_inode_to_client(inode); + +doutc (cl,"%p %llx.%llx len %u offs %u blk %llu\n" , inode, +ceph_vinop (inode), len, offs, lblk_num);return fscrypt_encrypt_block_inplace (inode, page, len, offs, lblk_num, gfp_flags); }
@@ -582,6 +590,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, u64 off, struct ceph_sparse_extent *map, u32 ext_cnt) { + struct ceph_client *cl = ceph_inode_to_client(inode);int i, ret =0 ;struct ceph_inode_info *ci =ceph_inode (inode);u64 objno, objoff;
@@ -589,7 +598,8 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page,/* Nothing to do for empty array */ if (ext_cnt ==0 ) { -dout ("%s: empty array, ret 0\n" , __func__); +doutc (cl,"%p %llx.%llx empty array, ret 0\n" , inode, +ceph_vinop (inode));return 0 ; }
@@ -603,14 +613,17 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page,int fret;if ((ext->off | ext->len) & ~CEPH_FSCRYPT_BLOCK_MASK ) { -pr_warn ("%s: bad encrypted sparse extent idx %d off %llx len %llx\n" , - __func__, i, ext->off, ext->len); +pr_warn_client (cl, +"%p %llx.%llx bad encrypted sparse extent " +"idx %d off %llx len %llx\n" , + inode,ceph_vinop (inode), i, ext->off, + ext->len);return -EIO ; } fret =ceph_fscrypt_decrypt_pages (inode, &page[pgidx], off + pgsoff, ext->len); -dout ("%s: [%d] 0x%llx~0x%llx fret %d\n" , __func__, i, - ext->off, ext->len, fret); +doutc (cl,"%p %llx.%llx [%d] 0x%llx~0x%llx fret %d\n" , inode, +ceph_vinop (inode), i, ext->off, ext->len, fret);if (fret <0 ) {if (ret ==0 ) ret = fret;
@@ -618,7 +631,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, } ret = pgsoff + fret; } -dout ("%s: ret %d\n" , __func__, ret); +doutc (cl,"ret %d\n" , ret);return ret; }
fs/ceph/debugfs.c +4 -2
@@ -398,7 +398,7 @@ DEFINE_SIMPLE_ATTRIBUTE(congestion_kb_fops, congestion_kb_get,void ceph_fs_debugfs_cleanup (struct ceph_fs_client *fsc) { -dout ("ceph_fs_debugfs_cleanup\n" ); +doutc (fsc->client,"begin\n" );debugfs_remove (fsc->debugfs_bdi);debugfs_remove (fsc->debugfs_congestion_kb);debugfs_remove (fsc->debugfs_mdsmap);
@@ -407,13 +407,14 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc)debugfs_remove (fsc->debugfs_status);debugfs_remove (fsc->debugfs_mdsc);debugfs_remove_recursive (fsc->debugfs_metrics_dir); +doutc (fsc->client,"done\n" ); }void ceph_fs_debugfs_init (struct ceph_fs_client *fsc) {char name[100 ]; -dout ("ceph_fs_debugfs_init\n" ); +doutc (fsc->client,"begin\n" ); fsc->debugfs_congestion_kb = debugfs_create_file("writeback_congestion_kb", 0600,
@@ -469,6 +470,7 @@ void ceph_fs_debugfs_init(struct ceph_fs_client *fsc) &metrics_size_fops);debugfs_create_file ("caps" ,0400 , fsc->debugfs_metrics_dir, fsc, &metrics_caps_fops); +doutc (fsc->client,"done\n" ); }
fs/ceph/dir.c +132 -86
353 lines not on this page · raw message
fs/ceph/file.c +141 -104
245 lines not on this page · raw message
fs/ceph/inode.c +267 -218
485 lines not on this page · raw message
fs/ceph/locks.c +33 -24
57 lines not on this page · raw message
fs/ceph/mds_client.c +313 -241
554 lines not on this page · raw message
fs/ceph/snap.c +95 -79
174 lines not on this page · raw message
fs/ceph/super.c +40 -30
70 lines not on this page · raw message
fs/ceph/xattr.c +57 -39
96 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.53.0
Part of the diff is not shown here. View the raw message.
Sasha Levin
maintainerPATCH 3/3 ceph: fix refcount leak in ceph_readdir()
In reply to Sasha LevinFrom: WenTao Liang <[email protected]>
[ Upstream commit c3e64079d8b9663e3998d0caac9aba915b6b93ae ]
The ceph_readdir() function allocates a ceph_mds_request via ceph_mdsc_create_request() and stores it in dfi->last_readdir. In the directory entry processing loop, if the entry's offset is less than ctx->pos or if the inode pointer is unexpectedly NULL, the function returns -EIO without releasing the reference held by dfi->last_readdir, causing a refcount leak.
Fix this by adding ceph_mdsc_put_request(dfi->last_readdir) before returning on these error paths. Also set dfi->last_readdir to NULL for safety, matching the cleanup done at the normal exit.
--- fs/ceph/dir.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ceph/dir.c +6 -1
@@ -546,11 +546,16 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)pr_warn_client (cl,"%p %llx.%llx rde->offset 0x%llx ctx->pos 0x%llx\n" , inode,ceph_vinop (inode), rde->offset, ctx->pos); +ceph_mdsc_put_request (dfi->last_readdir); + dfi->last_readdir =NULL ;return -EIO ; } -if (WARN_ON_ONCE (!rde->inode.in)) +if (WARN_ON_ONCE (!rde->inode.in)) { +ceph_mdsc_put_request (dfi->last_readdir); + dfi->last_readdir =NULL ;return -EIO ; + } ctx->pos = rde->offset; doutc(cl, "%p %llx.%llx (%d/%d) -> %llx '%.*s' %p\n", inode,
Signature · 1 line
2.53.0