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

moonlight83340 · krish2718 · commit f6cd3d855a35 · 2025-07-15T01:27:48.000+05:30
Move usage of ap_ctx pointers after null checks to prevent potential crashes. Signed-off-by: Gaetan Perrot <gaetan.perrot@spacecubics.com> (cherry picked from commit cd85510)
diff --git a/modules/hostap/src/hapd_events.c b/modules/hostap/src/hapd_events.c
@@ -62,13 +62,15 @@ int hostapd_send_wifi_mgmt_ap_sta_event(struct hostapd_iface *ap_ctx,
 					void *data)
 {
 	struct sta_info *sta = data;
-	char *ifname = ap_ctx->bss[0]->conf->iface;
+	char *ifname;
 	struct wifi_ap_sta_info sta_info = { 0 };
 
 	if (!ap_ctx || !sta) {
 		return -EINVAL;
 	}
 
+	ifname = ap_ctx->bss[0]->conf->iface;
+
 	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
`@@ -62,13 +62,15 @@ int hostapd_send_wifi_mgmt_ap_sta_event(struct hostapd_iface *ap_ctx,`
`62`	`62`	`void *data)`
`63`	`63`	`{`
`64`	`64`	`struct sta_info *sta = data;`
`65`		`- char *ifname = ap_ctx->bss[0]->conf->iface;`
	`65`	`+ char *ifname;`
`66`	`66`	`struct wifi_ap_sta_info sta_info = { 0 };`
`67`	`67`
`68`	`68`	`if (!ap_ctx \|\| !sta) {`
`69`	`69`	`return -EINVAL;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ ifname = ap_ctx->bss[0]->conf->iface;`
	`73`	`+`
`72`	`74`	`memcpy(sta_info.mac, sta->addr, sizeof(sta_info.mac));`
`73`	`75`
`74`	`76`	`if (event == NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) {`