Skip to contentSkip to conversation

station: fix crash if affinities watch gets removed

PATCH Applied James Prestwood 2 participants 2 messages Sep 10, 2024 – Sep 11, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 station: fix crash if affinities watch gets removed

If the affinity watch is removed by setting an empty list the disconnect callback won't be called which was the only place the watch ID was cleared. This resulted in the next SetProperty call to think a watch existed, and attempt to compare the sender address which would be NULL.

The watch ID should be cleared inside the destroy callback, not the disconnect callback.

---
 src/station.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
src/station.c +2 -1
index 56a90f5f..44f5f771 100644
@@ -4598,7 +4598,6 @@ static void station_affinity_disconnected_cb(struct l_dbus *dbus,
 	struct station *station = user_data;
 
 	l_dbus_remove_watch(dbus_get_bus(), station->affinity_watch);
-	station->affinity_watch = 0;
 
 	l_debug("client that set affinity has disconnected");
 
@@ -4611,6 +4610,8 @@ static void station_affinity_watch_destroy(void *user_data)
 	struct station *station = user_data;
 	bool empty = l_queue_length(station->affinities) == 0;
 
+	station->affinity_watch = 0;
+
 	l_free(station->affinity_client);
 	station->affinity_client = NULL;
 
Signature · 1 line
2.34.1
#1 lore raw

Hi James,

Quoted 6 lines · James Prestwood

If the affinity watch is removed by setting an empty list the disconnect callback won't be called which was the only place the watch ID was cleared. This resulted in the next SetProperty call to think a watch existed, and attempt to compare the sender address which would be NULL.

Quoted 6 lines

The watch ID should be cleared inside the destroy callback, not the disconnect callback.

---
  src/station.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

applied, thanks.

Regards,
-Denis