From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 30 Aug 2015 20:13:55 +0000 (+0200)
Subject: manager: remove ask-password fd from sd_event before closing it
X-Git-Tag: v226~65^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90990e28c9067b37cd5a8a90ed813a036fdd0bd0;p=thirdparty%2Fsystemd.git

manager: remove ask-password fd from sd_event before closing it

Otherwise we might attempt to remove a non-existing fd from epoll.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index ecea89c377a..ede2a9910da 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -250,8 +250,8 @@ static int manager_dispatch_ask_password_fd(sd_event_source *source,
 static void manager_close_ask_password(Manager *m) {
         assert(m);
 
-        m->ask_password_inotify_fd = safe_close(m->ask_password_inotify_fd);
         m->ask_password_event_source = sd_event_source_unref(m->ask_password_event_source);
+        m->ask_password_inotify_fd = safe_close(m->ask_password_inotify_fd);
         m->have_ask_password = -EINVAL;
 }