Skip to content

[dfs][ptyfs] 注销 pts 时释放文件对象 - #12055

Closed
cms19859230182-lang wants to merge 1 commit into
RT-Thread:masterfrom
cms19859230182-lang:fix/ptyfs-unregister-free
Closed

cms19859230182-lang wants to merge 1 commit into
RT-Thread:masterfrom
cms19859230182-lang:fix/ptyfs-unregister-free

Conversation

@cms19859230182-lang

@cms19859230182-lang cms19859230182-lang commented Nov 14, 2026 •

Copy link
Copy Markdown
Contributor

注销 pts 的时候会把以前的文件对象释放掉,反复开关会漏内存

现在直接改成关掉就释放的版本

修 #12023

Fix RT-Thread#12023

In ptyfs_unregister_pts(), when a pts file is removed from the root
directory list and its ptsno is returned to the bitmap pool, the
allocated struct ptyfs_file was not freed, resulting in a kernel memory
leak on every ptmx close.

Free pts_file via rt_free() after safely detaching it from the superblock
root list and returning the ptsno.
@cms19859230182-lang

Copy link
Copy Markdown
Contributor Author

在 中补齐了对 的 ,避免反复注销 pts 时泄漏内核内存。

@github-actions

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 fix/ptyfs-unregister-free
    Enter PR branch fix/ptyfs-unregister-free in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 fix/ptyfs-unregister-free 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/ptyfs-unregister-free branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/dfs/dfs_v2/filesystems/ptyfs/ptyfs.c

📊 Current Review Status (Last Updated: 2026-11-14 19:04 CST)


📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@github-actions

Copy link
Copy Markdown

@cms19859230182-lang cms19859230182-lang changed the title [dfs][ptyfs] free pts file when unregistering [dfs][ptyfs] 注销 pts 时释放文件对象 Nov 16, 2026

@Rbb666 Rbb666 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

审查基于当前提交 8a1186a2。

该问题已由 #12029 修复,并于 2026-11-16 合入 master,建议将 #12055 作为重复 PR 关闭。

#12029 除了释放 struct ptyfs_file,还增加了查找结果的引用计数、目录遍历的锁保护,并修复了 PTS 分配失败时的清理路径。

本 PR 仅在 ptyfs_unregister_pts() 中增加 rt_free(pts_file),仍有并发 use-after-free 风险:ptyfile_lookup() 返回前已经释放 sb->lock,而 ptyfs_ops_setattr() 随后仍会访问该对象;若另一线程此时关闭 master 并触发注销,就可能访问已释放的内存。getdents 的无锁遍历也存在同类风险。#12029 已包含所需的生命周期保护,无需再合入此单行修复。


Reviewed commit: 8a1186a2.

This issue was fixed by #12029, merged into master on 2026-11-16. Please close #12055 as a duplicate.

In addition to freeing struct ptyfs_file, #12029 adds references for lookup results, protects directory iteration with a lock, and fixes cleanup on PTS allocation failures.

The standalone rt_free(pts_file) in this PR introduces a concurrent use-after-free risk: ptyfile_lookup() releases sb->lock before returning, while ptyfs_ops_setattr() subsequently accesses the object. A concurrent master close can unregister and free it in between. Unlocked getdents iteration has the same lifetime problem. The required protection is already included in #12029.

@Rbb666 Rbb666 closed this Nov 17, 2026
@cms19859230182-lang

Copy link
Copy Markdown
Contributor Author

哦哦已经修了啊,那我好像白忙活了哈哈哈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants