[noup] zephyr: fix socket and memory leak when remove interface by GaofengZhangNXP · Pull Request #148 · zephyrproject-rtos/hostap

GaofengZhangNXP · 2026-07-08T09:24:45Z

When the interface is removed, the hostapd control socket is not closed,
resulting in a hostapd control socket leak.
hostapd_deinit can't get zephyr driver dev_ops,
and can't free hostapd memory during hostapd_init

MaochenWang1 · 2026-07-09T09:56:47Z

should not mention wlan-reset 2 in the commit message.

Copilot

Pull request overview

This PR targets Zephyr-specific cleanup issues during Wi-Fi reset/interface removal by improving teardown paths in the Zephyr driver and hostapd control interface so resources (control sockets/fds and allocated context) don’t leak.

Changes:

Update Zephyr hostapd driver deinit to retrieve dev_ops via get_dev_ops(if_ctx->dev_ctx) and add NULL safety.
Add zephyr_hostapd_ctrl_deinit() API and implement deferred fd cleanup in the eloop thread.
Simplify hostapd CLI connection close logic (removing unnecessary detach for a connection that was never attached).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File	Description
src/drivers/driver_zephyr.c	Adjusts hostapd deinit to fetch `dev_ops` from the device context and avoid NULL dereference.
hostapd/hostapd_cli_zephyr.h	Exposes the new Zephyr hostapd control deinit function.
hostapd/hostapd_cli_zephyr.c	Implements control deinit and fd cleanup logic to prevent control fd leaks on interface removal.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

krish2718 · 2026-07-14T08:28:19Z

You can run git clang-format HEAD~1 to format, I see some newline or spacing issues, this would take care of it and then you can amend the changes.

GaofengZhangNXP · 2026-07-14T10:20:44Z

should not mention wlan-reset 2 in the commit message.

update it

GaofengZhangNXP · 2026-07-14T11:28:00Z

You can run git clang-format HEAD~1 to format, I see some newline or spacing issues, this would take care of it and then you can amend the changes.

I executed git clang-format HEAD~1, but it reformatted the code to use spaces for indentation at the beginning of each line instead of tabs. According to the Zephyr coding style, tabs should be used for indentation. My original changes were all indented with tabs, so the formatting applied by git clang-format appears to be inconsistent with the expected Zephyr style.

jukkar · 2026-07-14T14:50:13Z

I executed git clang-format HEAD~1, but it reformatted the code to use spaces for indentation at the beginning of each line instead of tabs.

I cannot recommend to use clang-format for anything, it usually does bad job as you have noticed.

krish2718 · 2026-07-14T18:12:00Z

I executed git clang-format HEAD~1, but it reformatted the code to use spaces for indentation at the beginning of each line instead of tabs.

I cannot recommend to use clang-format for anything, it usually does bad job as you have noticed.

:). Probably because this repo doesn't have .clang-format file, there's one here https://github.com/zephyrproject-rtos/hostap/blob/main/wpa_supplicant/binder/.clang-format and here https://github.com/zephyrproject-rtos/zephyr/blob/main/.clang-format. Anyways that was just a suggestion to automate styling, up to you.

GaofengZhangNXP · 2026-07-15T03:06:43Z

git clang-format HEAD~1

thank your suggestion, I can use the .clang-format to format hostapd repo and zephyr repo PR, and update it

krish2718 · 2026-07-15T07:37:11Z


 	dev_ops->hapd_deinit(if_ctx->dev_priv);
-
+out:


This warrants a separate commit as its fixing a different leak.

you are right, this fix is a separate commit, you can check it

This is still part of the original commit to fix the control socket leak.

GaofengZhangNXP · 2026-07-15T08:45:01Z

should not mention wlan-reset 2 in the commit message.

update it

jukkar

Please adjust the commit messages a bit to make it clear that this is a zephyr specific change, so

[noup] zephyr: ....

When the interface is removed, the hostapd control socket is not closed, resulting in a hostapd control socket leak. Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>

hostapd_deinit can't get zephyr driver dev_ops, and can't free hostapd memory when hostapd_init Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>

GaofengZhangNXP · 2026-07-16T09:13:10Z

Please adjust the commit messages a bit to make it clear that this is a zephyr specific change, so
[noup] zephyr: ....

update it

when hostapd and supplicant interface is removed, zep_drv_if_ctx is free in hostapd and supplicant driver deinit. so need to check zep_drv_if_ctx if function parameteris zep_drv_if_ctx Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

 	if_ctx = priv;

-	dev_ops = (struct zep_wpa_supp_dev_ops *)if_ctx->dev_ops;
-	if (!dev_ops->hapd_deinit) {
+	dev_ops = get_dev_ops(if_ctx->dev_ctx);
+	if (!dev_ops || !dev_ops->hapd_deinit) {


+	/* Close ctrl_conn (just frees wpa_ctrl struct, no fd close) */
+	hostapd_cli_close_connection(hapd);
+	ctx = os_zalloc(sizeof(*ctx));
+	if (!ctx) {
+		/* Best-effort cleanup even on OOM to avoid leaking fds/socks */
+		if (hapd->recv_sock >= 0) {
+			eloop_unregister_read_sock(hapd->recv_sock);
+			close(hapd->recv_sock);
+			hapd->recv_sock = -1;
+		}
+		if (hapd->send_sock >= 0) {
+			close(hapd->send_sock);
+			hapd->send_sock = -1;
+		}
+		return;
+	}
+	ctx->recv_sock = hapd->recv_sock;
+	ctx->send_sock = hapd->send_sock;
+	hapd->recv_sock = -1;
+	hapd->send_sock = -1;
+	/* timeout=0: execute in next eloop iteration, in eloop thread */
+	if (eloop_register_timeout(0, 0, hapd_ctrl_close_fds, ctx, NULL) < 0)
+		hapd_ctrl_close_fds(ctx, NULL);


 int zephyr_hostapd_ctrl_init(void *ctx);
+void zephyr_hostapd_ctrl_deinit(void *hapd);
 int zephyr_hostapd_ctrl_zephyr_cmd(struct wpa_ctrl *ctrl, int argc, const char *argv[]);


GaofengZhangNXP requested review from MaochenWang1, jukkar and krish2718 as code owners July 8, 2026 09:24

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch from 2fef0bf to 0d898c8 Compare July 8, 2026 09:36

GaofengZhangNXP changed the title ~~123~~ [noup] zephyr wpa_supplicant and hostapd support add and remove interface when wlan-reset 2 Jul 8, 2026

GaofengZhangNXP changed the title ~~[noup] zephyr wpa_supplicant and hostapd support add and remove interface when wlan-reset 2~~ [noup] support add and remove supplicant interface when wifi reset Jul 8, 2026

fengming-ye reviewed Jul 8, 2026

View reviewed changes

Comment thread hostapd/hostapd_cli_zephyr.c Outdated

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 2 times, most recently from 4b0d5ca to 38d199b Compare July 9, 2026 03:06

github-actions Bot mentioned this pull request Jul 9, 2026

modules: hostapd: support add and remove supp and hostapd interface zephyrproject-rtos/zephyr#112987

Open

krish2718 reviewed Jul 10, 2026

View reviewed changes

Comment thread src/drivers/driver_zephyr.c

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 2 times, most recently from 63a323a to cc9e4de Compare July 13, 2026 08:57

GaofengZhangNXP changed the title ~~[noup] support add and remove supplicant interface when wifi reset~~ [noup] fix socket and memory leak when wifi remove interface Jul 13, 2026

krish2718 requested a review from Copilot July 13, 2026 12:53

Copilot started reviewing on behalf of krish2718 July 13, 2026 12:53 View session

Copilot AI reviewed Jul 13, 2026

View reviewed changes

Comment thread src/drivers/driver_zephyr.c

Comment thread hostapd/hostapd_cli_zephyr.c Outdated

Comment thread hostapd/hostapd_cli_zephyr.c

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 2 times, most recently from 35ddc60 to 5064f5c Compare July 14, 2026 08:16

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch from 5064f5c to 89b6551 Compare July 14, 2026 09:20

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 2 times, most recently from 22f6700 to 883db12 Compare July 14, 2026 10:31

krish2718 reviewed Jul 15, 2026

View reviewed changes

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch from 0822b1b to 52e3e11 Compare July 15, 2026 10:39

jukkar reviewed Jul 16, 2026

View reviewed changes

Comment thread src/drivers/driver_zephyr.c Outdated

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 2 times, most recently from 8ada1d6 to 883effa Compare July 16, 2026 08:03

MaochenWang1 reviewed Jul 16, 2026

View reviewed changes

Comment thread src/drivers/driver_zephyr.c Outdated

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch 3 times, most recently from a281f73 to 9981f90 Compare July 16, 2026 09:09

GaofengZhangNXP added 2 commits July 16, 2026 17:10

[noup] zephyr: fix socket leak when remove supp and hostapd interface

2b49b8c

When the interface is removed, the hostapd control socket is not closed, resulting in a hostapd control socket leak. Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>

[noup] zephyr: fix memory leak when wifi remove interface

258f599

hostapd_deinit can't get zephyr driver dev_ops, and can't free hostapd memory when hostapd_init Signed-off-by: Gaofeng Zhang <gaofeng.zhang@nxp.com>

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch from 9981f90 to f8abf18 Compare July 16, 2026 09:12

GaofengZhangNXP changed the title ~~[noup] fix socket and memory leak when wifi remove interface~~ [noup] zephyr: fix socket and memory leak when remove interface Jul 16, 2026

GaofengZhangNXP requested review from MaochenWang1, fengming-ye, jukkar and krish2718 July 16, 2026 10:38

GaofengZhangNXP force-pushed the wifi_intf_add_remove branch from f8abf18 to 1d52ab3 Compare July 16, 2026 10:44

MaochenWang1 approved these changes Jul 17, 2026

View reviewed changes

jukkar requested a review from Copilot July 17, 2026 08:16

Copilot started reviewing on behalf of jukkar July 17, 2026 08:16 View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes


		dev_ops->hapd_deinit(if_ctx->dev_priv);

		out:

Uh oh!

Conversation

GaofengZhangNXP commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

MaochenWang1 commented Jul 9, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

krish2718 commented Jul 14, 2026

Uh oh!

GaofengZhangNXP commented Jul 14, 2026

Uh oh!

GaofengZhangNXP commented Jul 14, 2026

Uh oh!

jukkar commented Jul 14, 2026

Uh oh!

krish2718 commented Jul 14, 2026

Uh oh!

GaofengZhangNXP commented Jul 15, 2026

Uh oh!

krish2718 Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

GaofengZhangNXP Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

krish2718 Jul 17, 2026

Choose a reason for hiding this comment

Uh oh!

GaofengZhangNXP commented Jul 15, 2026

Uh oh!

jukkar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

GaofengZhangNXP commented Jul 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

GaofengZhangNXP commented Jul 8, 2026 •

edited

Loading