summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2018-12-24 00:29:56 +0100
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-11-01 10:30:31 +0100
commit4d2145e3edd6ba6ac2e52a232fa5059ecdacaead (patch)
treeae0947d690a4736941a90b366e6542635479810c
parent7b00cae817e54ee3398ad3b42ec69a3b63676562 (diff)
downloadsystemd-4d2145e3edd6ba6ac2e52a232fa5059ecdacaead.tar.gz
journal: rely on _cleanup_free_ to free a temporary string used in client_context_read_cgroup
Closes https://github.com/systemd/systemd/issues/11253. (cherry picked from commit ef30f7cac18a810814ada7e6a68a31d48cc9fccd) Resolves: #1764560
-rw-r--r--src/journal/journald-context.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index c8e97e16de..3a768094d9 100644
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -282,7 +282,7 @@ static int client_context_read_label(
}
static int client_context_read_cgroup(Server *s, ClientContext *c, const char *unit_id) {
- char *t = NULL;
+ _cleanup_free_ char *t = NULL;
int r;
assert(c);
@@ -290,7 +290,6 @@ static int client_context_read_cgroup(Server *s, ClientContext *c, const char *u
/* Try to acquire the current cgroup path */
r = cg_pid_get_path_shifted(c->pid, s->cgroup_root, &t);
if (r < 0 || empty_or_root(t)) {
-
/* We use the unit ID passed in as fallback if we have nothing cached yet and cg_pid_get_path_shifted()
* failed or process is running in a root cgroup. Zombie processes are automatically migrated to root cgroup
* on cgroupsv1 and we want to be able to map log messages from them too. */
@@ -304,10 +303,8 @@ static int client_context_read_cgroup(Server *s, ClientContext *c, const char *u
}
/* Let's shortcut this if the cgroup path didn't change */
- if (streq_ptr(c->cgroup, t)) {
- free(t);
+ if (streq_ptr(c->cgroup, t))
return 0;
- }
free_and_replace(c->cgroup, t);