X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-kmsg.c;h=0c8446a3d59b8ac0ec23c32ead48ab333bf9848b;hb=f78e6385dc4cee0a1f399c4c89ebf823c108d447;hp=1730a23a97bc179d4f3947c468f9458bddebfeb1;hpb=445ea9be520b9549aee45d0b6427cf48b446987f;p=elogind.git

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 1730a23a9..0c8446a3d 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -408,22 +408,35 @@ int server_open_dev_kmsg(Server *s) {
 
                 /* This will fail with EPERM on older kernels where
                  * /dev/kmsg is not readable. */
-                if (r == -EPERM)
-                        return 0;
+                if (r == -EPERM) {
+                        r = 0;
+                        goto fail;
+                }
 
                 log_error("Failed to add /dev/kmsg fd to event loop: %s", strerror(-r));
-                return -errno;
+                goto fail;
         }
 
         r = sd_event_source_set_priority(s->dev_kmsg_event_source, SD_EVENT_PRIORITY_IMPORTANT+10);
         if (r < 0) {
                 log_error("Failed to adjust priority of kmsg event source: %s", strerror(-r));
-                return -errno;
+                goto fail;
         }
 
         s->dev_kmsg_readable = true;
 
         return 0;
+
+fail:
+        if (s->dev_kmsg_event_source)
+                s->dev_kmsg_event_source = sd_event_source_unref(s->dev_kmsg_event_source);
+
+        if (s->dev_kmsg_fd >= 0) {
+                close_nointr_nofail(s->dev_kmsg_fd);
+                s->dev_kmsg_fd = -1;
+        }
+
+        return r;
 }
 
 int server_open_kernel_seqnum(Server *s) {