Skip to contentSkip to conversation

Fix: do not repurpose iterator while it is being used (register trigger, 2.10)

PATCH Jérémie Galarneau 1 participant 1 message Jan 22, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in stable-2.10.

Thanks,
Jérémie

Quoted 41 lines · Mathieu Desnoyers

The hash table iteration uses an iterator that needs to stay valid for the next loop. Using that same iterator variable in a nested lookup in a different hash table leads to segmentation fault.

This is a 2.10-specific instance of the issue affecting bind_trigger_to_matching_channels() which was found in the master and 2.11 branches. This one affects handle_notification_thread_command_register_trigger().

---
 src/bin/lttng-sessiond/notification-thread-events.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
src/bin/lttng-sessiond/notification-thread-events.c +3 -3
index 6777fd6d..f54141e7 100644
@@ -1119,6 +1119,7 @@ int handle_notification_thread_command_register_trigger(
                        channels_ht_node) {
                struct lttng_trigger_list_element *trigger_list_element;
                struct lttng_channel_trigger_list *trigger_list;
+               struct cds_lfht_iter lookup_iter;
 
                if (!trigger_applies_to_channel(trigger, channel)) {
                        continue;
@@ -1128,8 +1129,8 @@ int handle_notification_thread_command_register_trigger(
                                hash_channel_key(&channel->key),
                                match_channel_trigger_list,
                                &channel->key,
-                               &iter);
-               node = cds_lfht_iter_get_node(&iter);
+                               &lookup_iter);
+               node = cds_lfht_iter_get_node(&lookup_iter);
                assert(node);
                trigger_list = caa_container_of(node,
                                struct lttng_channel_trigger_list,
--

2.11.0

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev