2017-01-31 17:11:17 +00:00
|
|
|
From f2f5c4de715e65db93d57d7bcafe9caef3f7a79e Mon Sep 17 00:00:00 2001
|
2017-01-29 22:22:41 +00:00
|
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
|
|
Date: Tue, 24 Jan 2017 22:24:07 -0500
|
|
|
|
|
Subject: [PATCH] core/execute: fix strv memleak
|
|
|
|
|
|
|
|
|
|
compile_read_write_paths() returns a normal strv from strv_copy(), and
|
|
|
|
|
setup_namespace() uses it read-only, so we should use strv_free to deallocate.
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit 06ec51d8ef30dce3c7f864633ba3a9888d18fed6)
|
|
|
|
|
---
|
|
|
|
|
src/core/execute.c | 6 +++---
|
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/core/execute.c b/src/core/execute.c
|
|
|
|
|
index f13ca30395..38cd486d82 100644
|
|
|
|
|
--- a/src/core/execute.c
|
|
|
|
|
+++ b/src/core/execute.c
|
|
|
|
|
@@ -1984,8 +1984,8 @@ static int compile_read_write_paths(
|
|
|
|
|
_cleanup_strv_free_ char **l = NULL;
|
|
|
|
|
char **rt;
|
|
|
|
|
|
|
|
|
|
- /* Compile the list of writable paths. This is the combination of the explicitly configured paths, plus all
|
|
|
|
|
- * runtime directories. */
|
|
|
|
|
+ /* Compile the list of writable paths. This is the combination of
|
|
|
|
|
+ * the explicitly configured paths, plus all runtime directories. */
|
|
|
|
|
|
|
|
|
|
if (strv_isempty(context->read_write_paths) &&
|
|
|
|
|
strv_isempty(context->runtime_directory)) {
|
|
|
|
|
@@ -2018,7 +2018,7 @@ static int apply_mount_namespace(Unit *u, const ExecContext *context,
|
|
|
|
|
const ExecParameters *params,
|
|
|
|
|
ExecRuntime *runtime) {
|
|
|
|
|
int r;
|
|
|
|
|
- _cleanup_free_ char **rw = NULL;
|
|
|
|
|
+ _cleanup_strv_free_ char **rw = NULL;
|
|
|
|
|
char *tmp = NULL, *var = NULL;
|
|
|
|
|
const char *root_dir = NULL;
|
|
|
|
|
NameSpaceInfo ns_info = {
|
