Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-08-18 02:58:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fix][dfs_elm] 修复关闭目录和释放vnode时的资源泄露

Browse Source
This commit is contained in:
angryproton
2026-07-13 10:54:07 +08:00
committed by Rbb666
parent 5af8b0af64
commit cf1c12ee06
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/dfs/dfs_v1/filesystems/elmfat/dfs_elm.c
+1
View File
@@ -481,6 +481,7 @@ int dfs_elm_close(struct dfs_file *file)
dir = (DIR *)(file->data);
RT_ASSERT(dir != RT_NULL);
f_closedir(dir);
/* release memory */
rt_free(dir);
}
components/dfs/dfs_v2/filesystems/elmfat/dfs_elm.c
+21 -3
View File
@@ -525,6 +525,7 @@ int dfs_elm_close(struct dfs_file *file)
dir = (DIR *)(file->vnode->data);
RT_ASSERT(dir != RT_NULL);
f_closedir(dir);
/* release memory */
rt_free(dir);
}
@@ -1017,10 +1018,27 @@ static struct dfs_vnode *dfs_elm_create_vnode(struct dfs_dentry *dentry, int typ
static int dfs_elm_free_vnode(struct dfs_vnode *vnode)
{
/* nothing to be freed */
if (vnode && vnode->ref_count <= 1)
/* free_vnode is the backstop destruction point: called from
dfs_vnode_unref when ref_count drops to 0, and from dfs_vnode_destroy on
a create/lookup failure (ref_count == 1). Normally dfs_elm_close has
already released the resource and set data = NULL, so this is a no-op.
It only tears down the resource when close bailed out early due to
ref_count > 1 (a transient lookup had raised it), which is exactly the
leak this guards against. data != NULL means the resource is still
live and the lock is still initialized, so both are released here. */
if (vnode && vnode->ref_count <= 1 && vnode->data != RT_NULL)
{
vnode->data = NULL;
if (vnode->type == FT_DIRECTORY)
{
f_closedir((DIR *)vnode->data);
}
else if (vnode->type == FT_REGULAR)
{
f_close((FIL *)vnode->data);
}
rt_free(vnode->data);
vnode->data = RT_NULL;
rt_mutex_detach(&vnode->lock);
}
return 0;