92cbc7b18c
Signed-off-by: zhongtao <zhongtao17@huawei.com> (cherry picked from commit bbcaf5a7227e418497e56c9f3495457e8cf7c652)
52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From 33bae817df87021795bc3aa7ad4aa3a30a164999 Mon Sep 17 00:00:00 2001
|
|
From: jikai <jikai11@huawei.com>
|
|
Date: Sat, 11 May 2024 16:05:27 +0800
|
|
Subject: [PATCH 212/213] fix bug for invalid env write
|
|
|
|
Signed-off-by: jikai <jikai11@huawei.com>
|
|
---
|
|
src/daemon/modules/spec/specs_extend.c | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/spec/specs_extend.c b/src/daemon/modules/spec/specs_extend.c
|
|
index b4b8af5a..e385ff4b 100644
|
|
--- a/src/daemon/modules/spec/specs_extend.c
|
|
+++ b/src/daemon/modules/spec/specs_extend.c
|
|
@@ -195,17 +195,18 @@ static int generate_env_map_from_file(FILE *fp, json_map_string_string *env_map)
|
|
char *value = NULL;
|
|
char *pline = NULL;
|
|
size_t length = 0;
|
|
- char *saveptr = NULL;
|
|
char empty_str[1] = {'\0'};
|
|
|
|
while (getline(&pline, &length, fp) != -1) {
|
|
util_trim_newline(pline);
|
|
pline = util_trim_space(pline);
|
|
- if (pline == NULL || pline[0] == '#') {
|
|
+ // if pline is invalid as =value, strtok_r will return value as key
|
|
+ // check if pline[0] == '=' to avoid this case
|
|
+ if (pline == NULL || pline[0] == '#' || pline[0] == '=') {
|
|
continue;
|
|
}
|
|
- key = strtok_r(pline, "=", &saveptr);
|
|
- value = strtok_r(NULL, "=", &saveptr);
|
|
+ // in case of key=value=value, value should be value=value
|
|
+ key = strtok_r(pline, "=", &value);
|
|
// value of an env varible is allowed to be empty
|
|
value = value ? value : empty_str;
|
|
if (key != NULL) {
|
|
@@ -302,7 +303,9 @@ static int check_env_need_append(const oci_runtime_spec *oci_spec, const char *e
|
|
tmp_env = util_strdup_s(oci_spec->process->env[i]);
|
|
key = strtok_r(tmp_env, "=", &saveptr);
|
|
// value of an env varible is allowed to be empty
|
|
- if (key == NULL) {
|
|
+ // if tmp_env is invalid as =value, strtok_r will return value as key
|
|
+ // check if tmp_env[0] == '=' to avoid this case
|
|
+ if (key == NULL || tmp_env[0] == '=') {
|
|
ERROR("Bad env format");
|
|
free(tmp_env);
|
|
tmp_env = NULL;
|
|
--
|
|
2.25.1
|
|
|