diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-07-23 10:27:19 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-07-23 16:08:06 +0200 |
commit | 81280b2a6fbad079b5d72f48160bf1d492cc8e57 (patch) | |
tree | 9ab6cdef248d27766a399f4e9c38bb1312e38399 /src/login/logind-inhibit.c | |
parent | 09f300c4d0dbeb0aae98d30eb2214d4f425527e9 (diff) | |
download | systemd-81280b2a6fbad079b5d72f48160bf1d492cc8e57.tar.gz |
logind: rework allocation/freeing of inhibitors
Let's follow our modern style (i.e. return proper errors, use structure
initialization and _cleanup_).
Most importantly: remove state file and FIFO removal from
inhibitor_free() and let's move it to inhibitor_stop().
This makes sure that state files/FIFOs are not removed when the we
terminate logind, i.e. that they can survive logind restarts.
Fixes: #11825
Diffstat (limited to 'src/login/logind-inhibit.c')
-rw-r--r-- | src/login/logind-inhibit.c | 59 |
1 files changed, 36 insertions, 23 deletions
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 8716a9f091..11cbb4534c 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -24,48 +24,59 @@ #include "user-util.h" #include "util.h" -Inhibitor* inhibitor_new(Manager *m, const char* id) { - Inhibitor *i; +int inhibitor_new(Inhibitor **ret, Manager *m, const char* id) { + _cleanup_(inhibitor_freep) Inhibitor *i = NULL; + int r; + assert(ret); assert(m); + assert(id); - i = new0(Inhibitor, 1); + i = new(Inhibitor, 1); if (!i) - return NULL; + return -ENOMEM; + + *i = (Inhibitor) { + .manager = m, + .what = _INHIBIT_WHAT_INVALID, + .mode = _INHIBIT_MODE_INVALID, + .uid = UID_INVALID, + .fifo_fd = -1, + }; i->state_file = path_join("/run/systemd/inhibit", id); if (!i->state_file) - return mfree(i); + return -ENOMEM; i->id = basename(i->state_file); - if (hashmap_put(m->inhibitors, i->id, i) < 0) { - free(i->state_file); - return mfree(i); - } - - i->manager = m; - i->fifo_fd = -1; + r = hashmap_put(m->inhibitors, i->id, i); + if (r < 0) + return r; - return i; + *ret = TAKE_PTR(i); + return 0; } -void inhibitor_free(Inhibitor *i) { - assert(i); - - hashmap_remove(i->manager->inhibitors, i->id); +Inhibitor* inhibitor_free(Inhibitor *i) { - inhibitor_remove_fifo(i); + if (!i) + return NULL; free(i->who); free(i->why); - if (i->state_file) { - (void) unlink(i->state_file); - free(i->state_file); - } + sd_event_source_unref(i->event_source); + safe_close(i->fifo_fd); - free(i); + /* Note that we don't remove neither the state file nor the fifo path here, since we want both to + * survive daemon restarts */ + free(i->state_file); + free(i->fifo_path); + + hashmap_remove(i->manager->inhibitors, i->id); + + return mfree(i); } int inhibitor_save(Inhibitor *i) { @@ -184,6 +195,8 @@ int inhibitor_stop(Inhibitor *i) { i->pid, i->uid, inhibit_mode_to_string(i->mode)); + inhibitor_remove_fifo(i); + if (i->state_file) (void) unlink(i->state_file); |