X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsckd%2Ffsckd.c;h=4ff8eeaeccf584cf8f84e205e97c76fe09cb9c37;hp=3abf962eebbfc1faa54cecc23ba174018db93d58;hb=e9d2527ff4b9a907cb8a4a035be646d3dd443abc;hpb=a922c18bce8d25f23c3614d3508f80658958a285

diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 3abf962ee..4ff8eeaec 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -34,16 +34,16 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#include "sd-daemon.h"
 #include "build.h"
 #include "def.h"
 #include "event-util.h"
-#include "fsckd.h"
 #include "log.h"
 #include "list.h"
 #include "macro.h"
-#include "sd-daemon.h"
 #include "socket-util.h"
 #include "util.h"
+#include "fsckd.h"
 
 #define IDLE_TIME_SECONDS 30
 #define PLYMOUTH_REQUEST_KEY "K\2\2\3"
@@ -102,16 +102,21 @@ static double compute_percent(int pass, size_t cur, size_t max) {
 }
 
 static int request_cancel_client(Client *current) {
-        FsckdMessage cancel_msg;
+        FsckdMessage cancel_msg = {
+                .cancel = 1,
+        };
+
         ssize_t n;
-        cancel_msg.cancel = 1;
 
         n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
-        if (n < 0 || (size_t) n < sizeof(FsckdMessage))
-                return log_warning_errno(n, "Cannot send cancel to fsck on (%u, %u): %m",
-                                         major(current->devnum), minor(current->devnum));
-        else
-                current->cancelled = true;
+        if (n < 0)
+                return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+        if ((size_t) n < sizeof(FsckdMessage)) {
+                log_warning("Short send when sending cancel to fsck on (%u:%u).", major(current->devnum), minor(current->devnum));
+                return -EIO;
+        }
+
+        current->cancelled = true;
         return 0;
 }
 
@@ -155,7 +160,7 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent
 
 static int send_message_plymouth_socket(int plymouth_fd, const char *message, bool update) {
         _cleanup_free_ char *packet = NULL;
-        int r, n;
+        int n;
         char mode = 'M';
 
         if (update)
@@ -163,31 +168,37 @@ static int send_message_plymouth_socket(int plymouth_fd, const char *message, bo
 
         if (asprintf(&packet, "%c\002%c%s%n", mode, (int) (strlen(message) + 1), message, &n) < 0)
                 return log_oom();
-        r = loop_write(plymouth_fd, packet, n + 1, true);
-        return r;
-}
 
+        return loop_write(plymouth_fd, packet, n + 1, true);
+}
 
 static int send_message_plymouth(Manager *m, const char *message) {
-        int r;
         const char *plymouth_cancel_message = NULL;
+        int r;
 
         r = connect_plymouth(m);
         if (r < 0)
                 return r;
 
         if (!m->plymouth_cancel_sent) {
-                /* indicate to plymouth that we listen to Ctrl+C */
+
+                /* Indicate to plymouth that we listen to Ctrl+C */
                 r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true);
                 if (r < 0)
-                        return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
+                        return log_warning_errno(r, "Can't send to plymouth cancel key: %m");
+
                 m->plymouth_cancel_sent = true;
+
                 plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
+
                 r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
                 if (r < 0)
                         log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
+
         } else if (m->numdevices == 0) {
+
                 m->plymouth_cancel_sent = false;
+
                 r = send_message_plymouth_socket(m->plymouth_fd, "", false);
                 if (r < 0)
                         log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m");
@@ -195,7 +206,7 @@ static int send_message_plymouth(Manager *m, const char *message) {
 
         r = send_message_plymouth_socket(m->plymouth_fd,  message, true);
         if (r < 0)
-                return log_warning_errno(errno, "Couldn't send \"%s\" to plymouth: %m", message);
+                return log_warning_errno(r, "Couldn't send \"%s\" to plymouth: %m", message);
 
         return 0;
 }
@@ -227,6 +238,7 @@ static int update_global_progress(Manager *m) {
                                       "Checking in progress on %d disks (%3.1f%% complete)", m->numdevices),
                                       m->numdevices, m->percent) < 0)
                         return -ENOMEM;
+
                 if (asprintf(&fsck_message, "fsckd:%d:%3.1f:%s", m->numdevices, m->percent, console_message) < 0)
                         return -ENOMEM;
 
@@ -260,17 +272,21 @@ static int connect_plymouth(Manager *m) {
                 return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
 
         if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
-                on_plymouth_disconnect(m);
-                return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+                r = log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+                goto fail;
         }
 
         r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
         if (r < 0) {
-                on_plymouth_disconnect(m);
-                return log_warning_errno(r, "Can't listen to plymouth socket: %m");
+                log_warning_errno(r, "Can't listen to plymouth socket: %m");
+                goto fail;
         }
 
         return 0;
+
+fail:
+        on_plymouth_disconnect(m);
+        return r;
 }
 
 static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {