picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: allow manager_serialize() to fail correctly

Browse source 
If manager_serialize() fails in the middle (which it hopefully doesn't)
make sure to fix up m->n_reloading correctly again so that we don't
leave it > 0 when it really shouldn't be.
This commit is contained in:
Lennart Poettering 2018-10-09 16:45:33 +02:00
parent fc37d875a1
commit 4daf832afa
1 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/core/manager.c
View file

@ -3043,7 +3043,12 @@ int manager_open_serialization(Manager *m, FILE **_f) {
return 0; return 0;
} }
int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) { int manager_serialize(
Manager *m,
FILE *f,
FDSet *fds,
bool switching_root) {
ManagerTimestamp q; ManagerTimestamp q;
const char *t; const char *t;
Iterator i; Iterator i;
@ -3097,8 +3102,10 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
int copy; int copy;
copy = fdset_put_dup(fds, m->notify_fd); copy = fdset_put_dup(fds, m->notify_fd);
if (copy < 0) if (copy < 0) {
return copy; r = copy;
goto finish;
}
fprintf(f, "notify-fd=%i\n", copy); fprintf(f, "notify-fd=%i\n", copy);
fprintf(f, "notify-socket=%s\n", m->notify_socket); fprintf(f, "notify-socket=%s\n", m->notify_socket);
@ -3108,8 +3115,10 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
int copy; int copy;
copy = fdset_put_dup(fds, m->cgroups_agent_fd); copy = fdset_put_dup(fds, m->cgroups_agent_fd);
if (copy < 0) if (copy < 0) {
return copy; r = copy;
goto finish;
}
fprintf(f, "cgroups-agent-fd=%i\n", copy); fprintf(f, "cgroups-agent-fd=%i\n", copy);
} }
@ -3118,12 +3127,16 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
int copy0, copy1; int copy0, copy1;
copy0 = fdset_put_dup(fds, m->user_lookup_fds[0]); copy0 = fdset_put_dup(fds, m->user_lookup_fds[0]);
if (copy0 < 0) if (copy0 < 0) {
return copy0; r = copy0;
goto finish;
}
copy1 = fdset_put_dup(fds, m->user_lookup_fds[1]); copy1 = fdset_put_dup(fds, m->user_lookup_fds[1]);
if (copy1 < 0) if (copy1 < 0) {
return copy1; r = copy1;
goto finish;
}
fprintf(f, "user-lookup=%i %i\n", copy0, copy1); fprintf(f, "user-lookup=%i %i\n", copy0, copy1);
} }
@ -3132,14 +3145,14 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
r = dynamic_user_serialize(m, f, fds); r = dynamic_user_serialize(m, f, fds);
if (r < 0) if (r < 0)
return r; goto finish;
manager_serialize_uid_refs(m, f); manager_serialize_uid_refs(m, f);
manager_serialize_gid_refs(m, f); manager_serialize_gid_refs(m, f);
r = exec_runtime_serialize(m, f, fds); r = exec_runtime_serialize(m, f, fds);
if (r < 0) if (r < 0)
return r; goto finish;
(void) fputc('\n', f); (void) fputc('\n', f);
@ -3152,24 +3165,25 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
fputc('\n', f); fputc('\n', f);
r = unit_serialize(u, f, fds, !switching_root); r = unit_serialize(u, f, fds, !switching_root);
if (r < 0) { if (r < 0)
m->n_reloading--; goto finish;
return r;
}
} }
assert(m->n_reloading > 0);
m->n_reloading--;
r = fflush_and_check(f); r = fflush_and_check(f);
if (r < 0) if (r < 0)
return r; goto finish;
r = bus_fdset_add_all(m, fds); r = bus_fdset_add_all(m, fds);
if (r < 0) if (r < 0)
return r; goto finish;
return 0; r = 0;
finish:
assert(m->n_reloading > 0);
m->n_reloading--;
return r;
} }
int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {