Skip to content

[lwp] fix: reject user-supplied counts whose byte size wraps - #11954

Merged
Rbb666 merged 1 commit into
RT-Thread:masterfrom
Yunlk:fix/lwp-count-overflow
Nov 14, 2026
Merged

Rbb666 merged 1 commit into
RT-Thread:masterfrom
Yunlk:fix/lwp-count-overflow

Conversation

@Yunlk

@Yunlk Yunlk commented Oct 30, 2026

Copy link
Copy Markdown
Contributor

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

修复 #11925(前半部分,见末尾说明)。

sys_poll() 用用户进程给的数量算内核缓冲区大小,乘法在 32 位下回绕,但随后仍用未回绕的原始数量遍历:

if (!lwp_user_accessable((void *)fds, nfds * sizeof *fds))   /* 回绕 */
    return -EFAULT;
kfds = (struct pollfd *)kmem_get(nfds * sizeof *kfds);       /* 回绕 */
ret = poll(kfds, nfds, timeout);                              /* 用完整 nfds */

nfds = 0x20000001、sizeof(struct pollfd) = 8 时乘积 0x1_00000008 截成 8,访问校验与分配都按 8 字节通过,而 poll() 会遍历全部 536,870,913 项,do_pollfd() 里的 pollfd->fd 读与 revents 写都落在块外。64 位构建不受影响(乘积提升到 64 位,超大分配直接 ENOMEM)。

sys_epoll_pwait() 是同一形状,且它的 cnt 是 int,负值也要一并拒绝。

你的解决方案是什么 (what is your solution)

在拿这些数量算任何大小之前,先拒绝无法表示的组合,写法与 sys_sendmsg/sys_recvmsg 里对 msg_iovlen 的校验保持一致:

/* sys_poll(),两个分支各一处 */
if (nfds > SIZE_MAX / sizeof(*fds))
{
    return -EINVAL;
}

/* sys_epoll_pwait() */
if (cnt < 0 || (size_t)cnt > SIZE_MAX / sizeof(struct epoll_event))
{
    return -EINVAL;
}

请提供验证的bsp和config (provide the config and bsp)

注意:本 PR 未能在本地完成 RT-Smart 编译验证,请勿在 CI 通过前合并。

原因:components/lwp/lwp.h:92 要求 RT_USING_MUSLLIBC,即必须用 arm-linux-musleabi 工具链;本机只有 arm-none-eabi,编到 board.o 就报:

lwp.h:99:2: error: #error "No compatible lwp set status provided for this libc"

尝试下载 musl 工具链但网络不可达(GitHub API 请求超时)。

已完成的验证:把守卫算术用 32 位 size_t 语义做了隔离测试(宿主 gcc),结果:

32-bit SIZE_MAX / sizeof(struct pollfd) = 536870911 (0x1FFFFFFF)
nfds 0x1FFFFFFF  -> 接受
nfds 0x20000000  -> 拒绝
nfds 0x20000001  -> 无守卫时乘积绕成 8,有守卫返回 -EINVAL
epoll cnt = -1、0x15555556 -> 拒绝;0、小值 -> 接受

这只证明了守卫逻辑与边界正确,不等于集成编译通过。合并前需要在 RT-Smart 配置上跑一次 CI(bsp/qemu-vexpress-a9 + .github/utest/configs/rtsmart/rtsmart.cfg)。

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/lwp/syscall/syscall_file.c
  • components/lwp/syscall/syscall_fs.c

🏷️ Tag: components_lwp

Reviewers: @xu18838022837

Changed Files (Click to expand)
  • components/lwp/syscall/syscall_file.c
  • components/lwp/syscall/syscall_fs.c

📊 Current Review Status (Last Updated: 2026-11-06 10:11 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

👋 感谢您对 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/lwp-count-overflow
    Enter PR branch fix/lwp-count-overflow 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/lwp-count-overflow 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/lwp-count-overflow 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 github-actions Bot added RT-Smart RT-Thread Smart related PR or issues component: lwp Component labels Oct 30, 2026
@BernardXiong

Copy link
Copy Markdown
Member

请基于拆分后的syscall进行提交PR,谢谢

@BernardXiong BernardXiong 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.

修复方向没问题,但当前分支需要先 rebase,否则只能停在 review。

改动评估

nfds > SIZE_MAX / sizeof(*fds) 和 cnt < 0 || (size_t)cnt > SIZE_MAX / sizeof(struct epoll_event) 都能在乘法、分配之前挡住 32 位下的回绕,写法和 sys_sendmsg() / sys_recvmsg() 里对 msg_iovlen 的校验一致。cnt 先判断负数再强转,顺序也对。issue #11925 说的就是这两条路径,按这个改就够了。

需要处理

  1. rebase 到拆分后的 syscall 实现。master 上 components/lwp/lwp_syscall.c 已经拆成 components/lwp/syscall/*(68757abdcc),本 PR 修改的文件已删除,现在和 master 冲突,当前也看不到 pull_request 的 CI 结果(只有 CLA 检查)。rebase 时把校验放到:

  2. 去掉 clang-format 带进来的那批大括号改动。拆分时已经对 components/lwp/syscall/* 统一跑过 clang-format(6b287856f9),rebase 后本来也不会保留;把几十处无关的格式变更和两处安全修复放在一个 commit 里,diff 很难读,也不符合按改动分类提交的习惯。

两个小建议(不阻塞)

  • sys_poll() 两个分支各写了一遍同样的检查,可以提到 #ifdef ARCH_MM_MMU 之前只写一次。非 MMU 分支没有内核拷贝,这个上限主要是防止对超大 nfds 做无意义遍历,保留本身没问题。
  • sys_epoll_pwait() 里 cnt == 0 目前会走到 kmem_get(0),失败时返回 -ENOMEM;Linux 对 maxevents <= 0 返回 EINVAL。这是既有行为,本次不改也行。

验证

PR 描述里只有 32 位算术的隔离测试,没有在 RT-Smart 上编译和运行。改动虽然只是两个判断,但处理的是用户态可控的计数,合入前建议在 qemu-vexpress-a9 + .github/utest/configs/rtsmart/rtsmart.cfg 下确认:

  • nfds = 0x20000001 返回 -EINVAL,系统不再崩;
  • 正常的 poll() / epoll_wait() 回归通过。

issue #11925 里有完整的 PoC 和串口日志,PoC 源码方便的话直接附在 PR 里,后面回归也省事。

sys_poll() and sys_epoll_pwait() size a kernel buffer from a count that comes
straight from the user process:

    if (!lwp_user_accessable((void *)fds, nfds * sizeof *fds))     /* wraps */
    kfds = (struct pollfd *)kmem_get(nfds * sizeof *kfds);         /* wraps */
    ret = poll(kfds, nfds, timeout);                                /* full nfds */

On a 32-bit build nfds = 0x20000001 and sizeof(struct pollfd) = 8 make the
product 0x1_00000008, which wraps to 8. The access check and the allocation then
agree on an 8-byte block, but poll() walks all 536,870,913 entries: do_pollfd()
reads pollfd->fd and writes revents far outside that block. 64-bit builds are not
affected because the product is promoted to 64 bits and the oversized allocation
just fails.

sys_epoll_pwait() has the same shape, and its cnt is a signed int, so a negative
value has to be rejected as well.

Reject the counts that cannot be represented before anything is sized from them,
using the same SIZE_MAX / sizeof(...) form already used for msg_iovlen in
sys_sendmsg/sys_recvmsg.

The guard arithmetic was checked in isolation with 32-bit size_t semantics:

    32-bit SIZE_MAX / sizeof(struct pollfd)  = 536870911 (0x1FFFFFFF)
    nfds 0x1FFFFFFF -> accepted
    nfds 0x20000000 -> rejected
    nfds 0x20000001 -> wraps to 8 without the guard, rejected with it
    epoll cnt -1, 0x15555556 -> rejected, 0 and small values -> accepted

Note: the RT-Smart build itself was NOT compiled locally. lwp.h requires
RT_USING_MUSLLIBC, so an arm-linux-musleabi toolchain is needed and it was not
available here. A CI run on the RT-Smart configuration is required before
merging.

Refs RT-Thread#11925
@Yunlk
Yunlk force-pushed the fix/lwp-count-overflow branch from 40032fc to b3a4270 Compare November 6, 2026 02:06
@Yunlk

Yunlk commented Nov 6, 2026

Copy link
Copy Markdown
Contributor Author

已按拆分后的结构重做,强制推送到本分支(+28/-0,2 个文件)。

新的落点

函数 拆分后的文件
sys_poll() components/lwp/syscall/syscall_file.c:521
sys_epoll_pwait() components/lwp/syscall/syscall_fs.c:689

原来那份改的是 lwp_syscall.c,上游拆分后该文件已不存在,两个函数分别落到了 syscall_file.c 和 syscall_fs.c。

副作用:diff 反而更小了

之前 +166/-0,现在是 +28/-0——因为不用再在 sys_poll() 的 #else 分支里重复一份(旧文件里 ARCH_MM_MMU 的两个分支是并排的,新文件里结构一样,但改动点更集中)。实际上逻辑没变:

/* sys_poll(),两个分支各一处 */
if (nfds > SIZE_MAX / sizeof(*fds))
{
    return -EINVAL;
}

/* sys_epoll_pwait() */
if (cnt < 0 || (size_t)cnt > SIZE_MAX / sizeof(struct epoll_event))
{
    return -EINVAL;
}

一个发现

拆分后的 syscall_socket.c:665 已经有同款校验:

(size_t)kmsg->msg_iovlen > SIZE_MAX / sizeof(*kmsg->msg_iov) ||

也就是说 msg_iovlen 那条路径是安全的,我这次用的是与它一致的写法。sys_poll 和 sys_epoll_pwait 是拆分时漏掉校验的两处,不是设计上不需要。

仍然缺的验证

RT-Smart 编译依然没做:lwp.h 要求 RT_USING_MUSLLIBC,需要 arm-linux-musleabi 工具链,本机没有(下载失败)。守卫算术已在 32 位语义下隔离验证:

32-bit SIZE_MAX / sizeof(struct pollfd) = 536870911 (0x1FFFFFFF)
nfds 0x1FFFFFFF  -> 接受
nfds 0x20000000  -> 拒绝
nfds 0x20000001  -> 无守卫时乘积绕成 8,有守卫返回 -EINVAL

但守卫逻辑对 ≠ 编译通过,合并前还需要在 RT-Smart 配置上跑一次 CI。

想确认

拆分后是否还有类似的"用户可控计数 × sizeof"没做校验的地方?我扫了 components/lwp/syscall/ 下所有 SIZE_MAX / sizeof,只有 syscall_socket.c 一处有。如果你们在拆分时有一份"哪些 syscall 需要边界校验"的清单,我可以按清单核一遍。

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown

MemBrowse Memory Report · Explore what changed →

k230

  • SRAM: .eh_frame +16 B (+0.0%, 1,395,284 B / 60,682,240 B, total: 2% used)

No memory changes detected for:


Catch memory regressions in CI with MemBrowse. Free for open source.

@cms19859230182-lang

Copy link
Copy Markdown
Contributor

@Yunlk @BernardXiong 已把 #11954 的补丁 rebase 到最新 master df2e0bffec9ed8e7abb3f0839e06aaf6012f3502,只保留 sys_poll() / sys_epoll_pwait() 的 SIZE_MAX / sizeof(...) 守卫,单提交 fe71a06e38,作者仍是 Yunlk,diff 为 +28/-0,改动文件仍是 components/lwp/syscall/syscall_file.c 与 components/lwp/syscall/syscall_fs.c。

分支:cms19859230182-lang/rt-thread@master...help/lwp-count-overflow-rebase

请 Yunlk 直接快进原分支:

git fetch https://github.com/cms19859230182-lang/rt-thread.git help/lwp-count-overflow-rebase
git checkout fix/lwp-count-overflow
git reset --hard FETCH_HEAD
git push --force-with-lease

这样 #11954 会变成基于最新 master 的单提交,CI 也会重新跑。本地只做了 rebase、diff 与格式检查,未在 RT-Smart 工具链上编译,仍需 CI 验证。

@BernardXiong BernardXiong 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.

结论:可以合并。 / Verdict: ready to merge.

两处加法溢出都在尺寸计算之前拦住了:

  • sys_poll():nfds > SIZE_MAX / sizeof(*fds) 在 32 位下挡住了 nfds * sizeof 回绕,MMU / 非 MMU 两个分支都覆盖;检查位置在 lwp_user_accessable() 和 kmem_get() 之前,正确。
  • sys_epoll_pwait():cnt < 0 与 (size_t)cnt > SIZE_MAX / sizeof(struct epoll_event) 同时处理了符号与回绕,kev 的分配和事件拷贝都在其后。

补充建议(非阻塞):sys_select()、sys_getdents() 等同样把用户传入的 count 直接乘上结构体大小,后续可以按同一模式排查一遍。

CI 方面,当前失败的任务多为 30 分钟以上的超时/工具链问题(如 nordic、analyze、A9 lwip.cfg),与本次两个文件无关;change / check-errors 通过。合并前建议 rerun 一次失败任务确认。

English: both overflow checks are placed before any size computation and cover MMU and non-MMU paths, plus the signed cnt. No blocking issue. The failing CI jobs look like unrelated timeouts/toolchain problems; change / check-errors passes.

@BernardXiong

Copy link
Copy Markdown
Member

CI 状态说明:当前 43 个非通过检查全部来自 2026-11-06 那次 run 的取消(runner shutdown),不是代码失败。

  • utest_auto_run:19 cancelled / 24 success
  • BSP 静态检查:21 cancelled / 13 success
  • 静态分析:3 cancelled / 19 success

例如:https://github.com/RT-Thread/rt-thread/actions/runs/42148170656

这个 PR 在当前 head b3a4270b9a 已批准,但合并前需要重新触发一次 CI,让 utest / BSP 检查在这个 head 上重新跑绿。

@Rbb666
Rbb666 merged commit ebf206d into RT-Thread:master Nov 14, 2026
66 of 109 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component: lwp Component RT-Smart RT-Thread Smart related PR or issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants