diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-10-17 20:40:09 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-26 10:52:41 +0200 |
commit | d68c645bd3323ae1f0dfcb8fd74ea6b19681db8a (patch) | |
tree | eff23147292bf0e0ee6066054b8e6e933ccd1b64 /src/login/logind-session.c | |
parent | cdd620e3460b08d1f5b80cefefef352de42fb792 (diff) | |
download | systemd-d68c645bd3323ae1f0dfcb8fd74ea6b19681db8a.tar.gz |
core: rework serialization
Let's be more careful with what we serialize: let's ensure we never
serialize strings that are longer than LONG_LINE_MAX, so that we know we
can read them back with read_line(…, LONG_LINE_MAX, …) safely.
In order to implement this all serialization functions are move to
serialize.[ch], and internally will do line size checks. We'd rather
skip a serialization line (with a loud warning) than write an overly
long line out. Of course, this is just a second level protection, after
all the data we serialize shouldn't be this long in the first place.
While we are at it also clean up logging: while serializing make sure to
always log about errors immediately. Also, (void)ify all calls we don't
expect errors in (or catch errors as part of the general
fflush_and_check() at the end.
Diffstat (limited to 'src/login/logind-session.c')
-rw-r--r-- | src/login/logind-session.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index cadf5b7879..197154a897 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -26,6 +26,7 @@ #include "parse-util.h" #include "path-util.h" #include "process-util.h" +#include "serialize.h" #include "string-table.h" #include "strv.h" #include "terminal-util.h" @@ -546,9 +547,9 @@ int session_load(Session *s) { } if (realtime) - timestamp_deserialize(realtime, &s->timestamp.realtime); + (void) deserialize_usec(realtime, &s->timestamp.realtime); if (monotonic) - timestamp_deserialize(monotonic, &s->timestamp.monotonic); + (void) deserialize_usec(monotonic, &s->timestamp.monotonic); if (active) { k = parse_boolean(active); |