[nrf fromtree] modules: hostap: supp_events: Fix possible null deference

moonlight83340 · krish2718 · commit 380a770fc76e · 2025-07-15T01:41:44.000+05:30
Move usage of ap_ctx pointers after null checks to prevent potential
crashes.

Signed-off-by: Gaetan Perrot &lt;gaetan.perrot@spacecubics.com&gt;
(cherry picked from commit 8a565c0a2b8c12b1ea0298367a0ff525c1ae20b8)
diff --git a/modules/hostap/src/supp_events.c b/modules/hostap/src/supp_events.c
@@ -304,13 +304,15 @@ int supplicant_send_wifi_mgmt_ap_sta_event(void *ctx,
 {
 	struct sta_info *sta = data;
 	struct wpa_supplicant *ap_ctx = ctx;
-	char *ifname = ap_ctx->ifname;
+	char *ifname;
 	struct wifi_ap_sta_info sta_info = { 0 };
 
 	if (!ap_ctx || !sta) {
 		return -EINVAL;
 	}
 
+	ifname = ap_ctx->ifname;
+
 	memcpy(sta_info.mac, sta->addr, sizeof(sta_info.mac));
 
 	if (event == NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) {

Original file line number	Diff line number	Diff line change
`@@ -304,13 +304,15 @@ int supplicant_send_wifi_mgmt_ap_sta_event(void *ctx,`
`304`	`304`	`{`
`305`	`305`	`struct sta_info *sta = data;`
`306`	`306`	`struct wpa_supplicant *ap_ctx = ctx;`
`307`		`- char *ifname = ap_ctx->ifname;`
	`307`	`+ char *ifname;`
`308`	`308`	`struct wifi_ap_sta_info sta_info = { 0 };`
`309`	`309`
`310`	`310`	`if (!ap_ctx \|\| !sta) {`
`311`	`311`	`return -EINVAL;`
`312`	`312`	`}`
`313`	`313`
	`314`	`+ ifname = ap_ctx->ifname;`
	`315`	`+`
`314`	`316`	`memcpy(sta_info.mac, sta->addr, sizeof(sta_info.mac));`
`315`	`317`
`316`	`318`	`if (event == NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) {`