Skip to content

[lwip-dhcpd] Fix pbuf leak for oversized requests - #11698

Merged
Rbb666 merged 1 commit into
RT-Thread:masterfrom
Zepp-Hanzj:agent/fix-lwip-dhcpd-pbuf-leak
Aug 12, 2026
Merged

[lwip-dhcpd] Fix pbuf leak for oversized requests#11698
Rbb666 merged 1 commit into
RT-Thread:masterfrom
Zepp-Hanzj:agent/fix-lwip-dhcpd-pbuf-leak

Conversation

@Zepp-Hanzj

Copy link
Copy Markdown
Contributor

Description

Fix the pbuf leak in the lwIP DHCP raw server when an incoming request is larger than the allocated response buffer.

Root cause

dhcp_server_recv() allocates q and returns early when q->tot_len < p->tot_len. That error path freed the received request pbuf p, but did not free the newly allocated pbuf q.

Changes

  • Free q before returning from the oversized-request error path.
  • Keep the existing cleanup of p unchanged.

Impact

Prevents a pbuf leak for oversized DHCP requests. Normal request handling is unchanged.

Validation

  • git diff --check
  • Reviewed all early returns after q allocation to confirm both pbufs are released on this path.

Fixes #11590

@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

  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to:agent/fix-lwip-dhcpd-pbuf-leak
  • 设置PR number为 \ Set the PR number to:11698
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 agent/fix-lwip-dhcpd-pbuf-leak 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the agent/fix-lwip-dhcpd-pbuf-leak 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/net/lwip-dhcpd/dhcp_server_raw.c

📊 Current Review Status (Last Updated: 2026-08-12 09:42 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.

@Zepp-Hanzj
Zepp-Hanzj marked this pull request as ready for review August 12, 2026 02:26
@Rbb666
Rbb666 merged commit c00f130 into RT-Thread:master Aug 12, 2026
50 checks passed
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.

[Bug] lwip-dhcpd raw server leaks copied pbuf when request is larger than reply buffer

2 participants