shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

core: fix mtime calculation of dropin files

Browse Source 
Nominally, the bug was in unit_load_dropin(), which just took the last mtime
instead of calculating the maximum. But instead of adding code to wrap the
loop, this patch goes in the other direction.

All (correct) callers of config_parse() followed a very similar pattern to
calculate the maximum mtime. So let's simplify things by making config_parse()
assume that mtime is initialized and update it to the maximum. This makes all
the callers that care about mtime simpler and also fixes the issue in
unit_load_dropin().

config_parse_many_nulstr() and config_parse_many() are different, because it
makes sense to call them just once, and current ret_mtime behaviour make sense.

Fixes #17730, https://bugzilla.redhat.com/show_bug.cgi?id=1933137.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-03-04 00:36:24 +01:00 committed by Yu Watanabe
parent 0746159886
commit da46a1bc3c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/load-dropin.c
View File

@ -112,6 +112,7 @@ int unit_load_dropin(Unit *u) {
return log_oom();
}
u->dropin_mtime = 0;
STRV_FOREACH(f, u->dropin_paths)
(void) config_parse(
u->id, *f, NULL,

14
src/shared/conf-parser.c
View File

@ -263,7 +263,7 @@ int config_parse(
const void *table,
ConfigParseFlags flags,
void *userdata,
usec_t *ret_mtime) {
usec_t *latest_mtime) {
_cleanup_free_ char *section = NULL, *continuation = NULL;
_cleanup_fclose_ FILE *ours = NULL;
@ -275,6 +275,9 @@ int config_parse(
assert(filename);
assert(lookup);
/* latest_mtime is an input-output parameter: it will be updated if the mtime of the file we're
* looking at is later than the current *latest_mtime value. */
if (!f) {
f = ours = fopen(filename, "re");
if (!f) {
@ -417,8 +420,8 @@ int config_parse(
}
}
if (ret_mtime)
*ret_mtime = mtime;
if (latest_mtime)
*latest_mtime = MAX(*latest_mtime, mtime);
return 1;
}
@ -448,12 +451,9 @@ static int config_parse_many_files(
/* Then read all the drop-ins. */
STRV_FOREACH(fn, files) {
usec_t t;
r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t);
r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime);
if (r < 0)
return r;
mtime = MAX(mtime, t); /* Find the newest */
}
if (ret_mtime)

2
src/shared/conf-parser.h
View File

@ -89,7 +89,7 @@ int config_parse(
const void *table,
ConfigParseFlags flags,
void *userdata,
usec_t *ret_mtime); /* possibly NULL */
usec_t *latest_mtime); /* input/output, possibly NULL */
int config_parse_many_nulstr(
const char *conf_file, /* possibly NULL */