From: Maximilian Blenk <Maximilian.Blenk@bmw.de>
Date: Wed, 5 Feb 2020 18:17:51 +0000 (+0100)
Subject: container.conf: Fix off by 2 in option parsing
X-Git-Tag: lxc-4.0.0~54^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ab03ac1936f05a0e50143b7d1ba92f2722c484;p=thirdparty%2Flxc.git

container.conf: Fix off by 2 in option parsing

This commit fixes a off by 2 in config option parsing
(due to missing parenthesis). The error occurs if for instance
lxc.net.0.type is parsed. In that case, the .0 is removed from the
string. However, due to the missing parenthesis, the null terminating
character is off by two which means the modified config option would
be lxc.net.typepe instead of lxc.net.type.

Signed-off-by: Maximilian Blenk <Maximilian.Blenk@bmw.de>
---

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index ae28163bb..e52072ee8 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -4929,7 +4929,7 @@ static struct lxc_config_t *get_network_config_ops(const char *key,
 		}
 
 		memmove(copy + 8, idx_end + 1, strlen(idx_end + 1));
-		copy[strlen(key) - numstrlen + 1] = '\0';
+		copy[strlen(key) - (numstrlen + 1)] = '\0';
 
 		config = lxc_get_config(copy);
 		if (!config) {