cephfs: Fixed a bug in the readdir_cache_cb function that may have used freed memory...

Fixes: https://tracker.ceph.com/issues/56288
Signed-off-by: Tod Chen <chentao.2022@bytedance.com>
(cherry picked from commit a71c9dd7e57a6a1dd64ccfb67f24c2a7cf29f652

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 5bc050e97b5de74e7682edfbc7d2d4118f0a3947..6d5d2ded8575779c5b2ee8eafdca635fcc922f52 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -9398,6 +9398,12 @@ int Client::_readdir_cache_cb(dir_result_t *dirp, add_dirent_cb_t cb, void *p,
     int r = _getattr(dn->inode, mask, dirp->perms);
     if (r < 0)
       return r;
+
+    /* fix https://tracker.ceph.com/issues/56288 */
+    if (dirp->inode->dir == NULL) {
+      ldout(cct, 0) << " dir is closed, so we should return" << dendl;
+      return -CEPHFS_EAGAIN;
+    }
     
     // the content of readdir_cache may change after _getattr(), so pd may be invalid iterator    
     pd = dir->readdir_cache.begin() + idx;