SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-event: Fix sd_event_source leak

Browse Source 
Hinted by CID#1591563 but the issue is different -- when
sd_event_source_set_destroy_callback() fails, we would use the old
n_sources value and possibly missing sd_event_source_unref() of the last
added source.
This commit is contained in:
Michal Koutný
2025-02-28 15:16:53 +01:00
parent af69ea714d
commit 1644724a4d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-event/event-util.c
+4 -3
View File
@@ -274,16 +274,17 @@ int event_forward_signals(
return -ENOMEM;
FOREACH_ARRAY(sig, signals, n_signals) {
r = sd_event_add_signal(e, &sources[n_sources], *sig | SD_EVENT_SIGNAL_PROCMASK, event_forward_signal_callback, child);
_cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
r = sd_event_add_signal(e, &s, *sig | SD_EVENT_SIGNAL_PROCMASK, event_forward_signal_callback, child);
if (r < 0)
return r;
r = sd_event_source_set_destroy_callback(sources[n_sources], event_forward_signal_destroy);
r = sd_event_source_set_destroy_callback(s, event_forward_signal_destroy);
if (r < 0)
return r;
sd_event_source_ref(child);
n_sources++;
sources[n_sources++] = TAKE_PTR(s);
}
*ret_sources = TAKE_PTR(sources);