d2bf32cae3
including: 3e0cafd6 supplementary registry design documentation a6b8a2c0 bugfix:do purge container when do_start_container failed 2a307813 image store: add UT 255fada4 image layer:fix code style 6766ace8 bugfix:fix exec --detach for shim v2 3c9d51bf bugfix for workdir len verify f55efffa bug fix: Isula ps not display N/A when ports empty 9006b290 bugfix:overwriting when i is len-1 Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com> (cherry picked from commit ca9c755d85eeece47f587426603a8f0d5c99eac9)
29 lines
1020 B
Diff
29 lines
1020 B
Diff
From 3c9d51bfdf0e71ac846946d746003139bf3a02c8 Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Tue, 26 Nov 2024 23:46:52 +1400
|
|
Subject: [PATCH 03/19] bugfix for workdir len verify
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
src/daemon/modules/runtime/isula/isula_rt_ops.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
index e628c3fe..22608e4c 100644
|
|
--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
+++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
@@ -786,8 +786,8 @@ static int shielded_output_check(const char *output, const char *workdir)
|
|
return 0;
|
|
}
|
|
|
|
- if (sizeof(chdir_pattern) > PATH_MAX - strlen("chdir ") - strlen(" failed")) {
|
|
- INFO("chdir_pattern is too long");
|
|
+ if (strlen(workdir) > PATH_MAX - strlen("chdir ") - strlen(" failed")) {
|
|
+ INFO("workdir is too long");
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
2.23.0
|
|
|