1 files changed, 14 insertions, 4 deletions

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 66edef12c6f2..8b136dc0bc13 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1389,7 +1389,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
         struct qstr dname;
         struct dentry *dn;
         struct inode *in;
-        int err = 0, ret, i;
+        int err = 0, skipped = 0, ret, i;
         struct inode *snapdir = NULL;
         struct ceph_mds_request_head *rhead = req->r_request->front.iov_base;
         struct ceph_dentry_info *di;
@@ -1501,7 +1501,17 @@ retry_lookup:
                 }
 
                 if (d_really_is_negative(dn)) {
-                        struct dentry *realdn = splice_dentry(dn, in);
+                        struct dentry *realdn;
+
+                        if (ceph_security_xattr_deadlock(in)) {
+                                dout(" skip splicing dn %p to inode %p"
+                                     " (security xattr deadlock)\n", dn, in);
+                                iput(in);
+                                skipped++;
+                                goto next_item;
+                        }
+
+                        realdn = splice_dentry(dn, in);
                         if (IS_ERR(realdn)) {
                                 err = PTR_ERR(realdn);
                                 d_drop(dn);
@@ -1518,7 +1528,7 @@ retry_lookup:
                                     req->r_session,
                                     req->r_request_started);
 
-                if (err == 0 && cache_ctl.index >= 0) {
+                if (err == 0 && skipped == 0 && cache_ctl.index >= 0) {
                         ret = fill_readdir_cache(d_inode(parent), dn,
                                                  &cache_ctl, req);
                         if (ret < 0)
@@ -1529,7 +1539,7 @@ next_item:
                         dput(dn);
         }
 out:
-        if (err == 0) {
+        if (err == 0 && skipped == 0) {
                 req->r_did_prepopulate = true;
                 req->r_readdir_cache_idx = cache_ctl.index;
         }