From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 15 Feb 2021 16:53:58 +0000 (+0100)
Subject: confile_utils: normalize paths in config items
X-Git-Tag: lxc-5.0.0~286^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d714159a3e055c384238ad68211bcea9aad338b;p=thirdparty%2Flxc.git

confile_utils: normalize paths in config items

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index cb79167ec..b2bf974be 100644
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -650,7 +650,13 @@ int set_config_string_item_max(char **conf_item, const char *value, size_t max)
 
 int set_config_path_item(char **conf_item, const char *value)
 {
-	return set_config_string_item_max(conf_item, value, PATH_MAX);
+	__do_free char *normalized = NULL;
+
+	normalized = lxc_deslashify(value);
+	if (!normalized)
+		return syserrno(-errno, "Failed to normalize path config item");
+
+	return set_config_string_item_max(conf_item, normalized, PATH_MAX);
 }
 
 int set_config_bool_item(bool *conf_item, const char *value, bool empty_conf_action)