* [PATCH] station: don't reset/(re)configure/destroy NULL netconfig's
@ 2019-10-03 16:43 Will Dietz
0 siblings, 0 replies; 3+ messages in thread
From: Will Dietz @ 2019-10-03 16:43 UTC (permalink / raw)
To: iwd
[-- Attachment #1: Type: text/plain, Size: 2290 bytes --]
Fixes crashes when `enable_network_config` is false (default).
---
src/station.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/station.c b/src/station.c
index eed3a7f..9b3e087 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1165,16 +1165,18 @@ static void station_enter_state(struct station *station,
periodic_scan_stop(station);
if (station->state == STATION_STATE_ROAMING) {
- netconfig_reconfigure(station->netconfig);
+ if (station->netconfig)
+ netconfig_reconfigure(station->netconfig);
break;
}
- netconfig_configure(station->netconfig,
- network_get_settings(
- station->connected_network),
- netdev_get_address(
- station->netdev));
+ if (station->netconfig)
+ netconfig_configure(station->netconfig,
+ network_get_settings(
+ station->connected_network),
+ netdev_get_address(
+ station->netdev));
break;
case STATION_STATE_DISCONNECTING:
case STATION_STATE_ROAMING:
@@ -1262,7 +1264,8 @@ static void station_disassociated(struct station *station)
{
l_debug("%u", netdev_get_ifindex(station->netdev));
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
station_reset_connection_state(station);
@@ -2344,7 +2347,8 @@ static void station_disconnect_onconnect(struct station *station,
return;
}
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
station_reset_connection_state(station);
@@ -2581,7 +2585,8 @@ int station_disconnect(struct station *station)
station_disconnect_cb, station) < 0)
return -EIO;
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
/*
* If the disconnect somehow fails we won't know if we're still
@@ -3061,7 +3066,8 @@ static void station_free(struct station *station)
if (station->connected_bss)
netdev_disconnect(station->netdev, NULL, NULL);
- netconfig_destroy(station->netconfig);
+ if (station->netconfig)
+ netconfig_destroy(station->netconfig);
station->netconfig = NULL;
periodic_scan_stop(station);
--
2.23.GIT
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] station: don't reset/(re)configure/destroy NULL netconfig's
@ 2019-10-03 17:24 Will Dietz
2019-10-03 17:35 ` Denis Kenzior
0 siblings, 1 reply; 3+ messages in thread
From: Will Dietz @ 2019-10-03 17:24 UTC (permalink / raw)
To: iwd
[-- Attachment #1: Type: text/plain, Size: 2286 bytes --]
Fixes crashes when `enable_network_config` is false (default).
---
src/station.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/station.c b/src/station.c
index eed3a7f..9b3e087 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1165,16 +1165,18 @@ static void station_enter_state(struct station *station,
periodic_scan_stop(station);
if (station->state == STATION_STATE_ROAMING) {
- netconfig_reconfigure(station->netconfig);
+ if (station->netconfig)
+ netconfig_reconfigure(station->netconfig);
break;
}
- netconfig_configure(station->netconfig,
- network_get_settings(
- station->connected_network),
- netdev_get_address(
- station->netdev));
+ if (station->netconfig)
+ netconfig_configure(station->netconfig,
+ network_get_settings(
+ station->connected_network),
+ netdev_get_address(
+ station->netdev));
break;
case STATION_STATE_DISCONNECTING:
case STATION_STATE_ROAMING:
@@ -1262,7 +1264,8 @@ static void station_disassociated(struct station *station)
{
l_debug("%u", netdev_get_ifindex(station->netdev));
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
station_reset_connection_state(station);
@@ -2344,7 +2347,8 @@ static void station_disconnect_onconnect(struct station *station,
return;
}
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
station_reset_connection_state(station);
@@ -2581,7 +2585,8 @@ int station_disconnect(struct station *station)
station_disconnect_cb, station) < 0)
return -EIO;
- netconfig_reset(station->netconfig);
+ if (station->netconfig)
+ netconfig_reset(station->netconfig);
/*
* If the disconnect somehow fails we won't know if we're still
@@ -3061,7 +3066,8 @@ static void station_free(struct station *station)
if (station->connected_bss)
netdev_disconnect(station->netdev, NULL, NULL);
- netconfig_destroy(station->netconfig);
+ if (station->netconfig)
+ netconfig_destroy(station->netconfig);
station->netconfig = NULL;
periodic_scan_stop(station);
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-03 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-03 16:43 [PATCH] station: don't reset/(re)configure/destroy NULL netconfig's Will Dietz
-- strict thread matches above, loose matches on Subject: below --
2019-10-03 17:24 Will Dietz
2019-10-03 17:35 ` Denis Kenzior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox