[systemd-commits] 3 commits - src/fsckd
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Mar 9 10:58:37 PDT 2015
src/fsckd/fsckd.c | 64 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 38 insertions(+), 26 deletions(-)
New commits:
commit df4573e85190759e39b417d4d4a8c73eda6a05e5
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:58:05 2015 +0100
fsck: don't read invalid data
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 0fac153..7780860 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -171,11 +171,11 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent
return 0;
}
- if (buffer[0] == '\15')
+ if (l > 1 && buffer[0] == '\15')
log_error("Message update to plymouth wasn't delivered successfully");
/* the only answer support type we requested is a key interruption */
- if (buffer[0] == '\2' && buffer[5] == '\3') {
+ if (l > 2 && buffer[0] == '\2' && buffer[5] == '\3') {
m->cancel_requested = true;
/* cancel all connected clients */
commit 0b02c7c36dbb6f2ec7434eb8d18e0410ee1cc74c
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:57:58 2015 +0100
fsckd: internaly check if a client already was cancelled
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 14fa994..0fac153 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -110,23 +110,28 @@ static double compute_percent(int pass, size_t cur, size_t max) {
(double) cur / max;
}
-static int request_cancel_client(Client *current) {
+static int client_request_cancel(Client *c) {
FsckdMessage cancel_msg = {
.cancel = 1,
};
ssize_t n;
- n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
+ assert(c);
+
+ if (c->cancelled)
+ return 0;
+
+ n = send(c->fd, &cancel_msg, sizeof(FsckdMessage), 0);
if (n < 0)
- return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+ return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(c->devnum), minor(c->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));
+ log_warning("Short send when sending cancel to fsck on (%u:%u).", major(c->devnum), minor(c->devnum));
return -EIO;
}
- current->cancelled = true;
- return 0;
+ c->cancelled = true;
+ return 1;
}
static void client_free(Client *c) {
@@ -175,7 +180,7 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent
/* cancel all connected clients */
LIST_FOREACH(clients, current, m->clients)
- request_cancel_client(current);
+ client_request_cancel(current);
}
return 0;
@@ -323,10 +328,8 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *
m = client->manager;
/* check first if we need to cancel this client */
- if (m->cancel_requested) {
- if (!client->cancelled)
- request_cancel_client(client);
- }
+ if (m->cancel_requested)
+ client_request_cancel(client);
/* ensure we have enough data to read */
r = ioctl(fd, FIONREAD, &buflen);
@@ -397,7 +400,7 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents,
}
/* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
if (m->cancel_requested)
- request_cancel_client(client);
+ client_request_cancel(client);
return 0;
}
commit f8824a512904449fa60333c500fc63c66b2937e5
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Mar 9 18:57:11 2015 +0100
fsck: simplify client destruction logic
diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index 757b9f1..14fa994 100644
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -54,10 +54,13 @@ typedef struct Client {
struct Manager *manager;
int fd;
dev_t devnum;
+
size_t cur;
size_t max;
int pass;
+
double percent;
+
size_t buflen;
bool cancelled;
@@ -66,17 +69,20 @@ typedef struct Client {
typedef struct Manager {
sd_event *event;
- Client *clients;
+
+ LIST_HEAD(Client, clients);
+
int clear;
int connection_fd;
+
FILE *console;
double percent;
int numdevices;
int plymouth_fd;
sd_event_source *plymouth_event_source;
-
bool plymouth_cancel_sent;
+
bool cancel_requested;
} Manager;
@@ -123,10 +129,14 @@ static int request_cancel_client(Client *current) {
return 0;
}
-static void remove_client(Client **first, Client *item) {
- LIST_REMOVE(clients, *first, item);
- safe_close(item->fd);
- free(item);
+static void client_free(Client *c) {
+ assert(c);
+
+ if (c->manager)
+ LIST_REMOVE(clients, c->manager->clients, c);
+
+ safe_close(c->fd);
+ free(c);
}
static void plymouth_disconnect(Manager *m) {
@@ -326,7 +336,7 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *
/* we got twice the same size from a bad behaving client, kick it off the list */
else {
log_warning("Closing bad behaving fsck client connection at fd %d", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
r = update_global_progress(m);
if (r < 0)
log_warning_errno(r, "Couldn't update global progress: %m");
@@ -338,7 +348,7 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *
r = recv(fd, &fsck_data, sizeof(FsckProgress), 0);
if (r == 0) {
log_debug("Fsck client connected to fd %d disconnected", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
} else if (r > 0 && r != sizeof(FsckProgress))
log_warning("Unexpected data structure sent to fsckd socket from fd: %d. Ignoring", client->fd);
else if (r > 0 && r == sizeof(FsckProgress)) {
@@ -382,7 +392,7 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents,
LIST_PREPEND(clients, m->clients, client);
r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
if (r < 0) {
- remove_client(&(m->clients), client);
+ client_free(client);
return r;
}
/* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
@@ -393,7 +403,6 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents,
}
static void manager_free(Manager *m) {
- Client *current = NULL, *l = NULL;
if (!m)
return;
@@ -415,8 +424,8 @@ static void manager_free(Manager *m) {
if (m->console)
fclose(m->console);
- LIST_FOREACH_SAFE(clients, current, l, m->clients)
- remove_client(&(m->clients), current);
+ while (m->clients)
+ client_free(m->clients);
sd_event_unref(m->event);
More information about the systemd-commits
mailing list