automatic import of iSuladopeneuler22.03_LTS

1 files changed, 36 insertions, 0 deletions

diff --git a/0056-bugfix-for-the-pre-created-pipe-was-not-closed-when-.patch b/0056-bugfix-for-the-pre-created-pipe-was-not-closed-when-.patch
new file mode 100644
index 0000000..607f721
--- /dev/null
+++ b/0056-bugfix-for-the-pre-created-pipe-was-not-closed-when-.patch
@@ -0,0 +1,36 @@
+From e8ba4368f4be369f99d7da6fc04dcbe173985cd0 Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Fri, 12 Apr 2024 14:42:05 +0800
+Subject: [PATCH 56/69] bugfix for the pre-created pipe was not closed when the
+ pipe creation failed
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ src/daemon/modules/runtime/isula/isula_rt_ops.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
+index 1875cf5b..47a14b1d 100644
+--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
++++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
+@@ -903,11 +903,17 @@ static int shim_create(shim_create_args *args)
+ 
+     if (pipe2(shim_stdout_pipe, O_CLOEXEC) != 0) {
+         ERROR("Failed to create pipe for shim stdout");
++        close(shim_stderr_pipe[0]);
++        close(shim_stderr_pipe[1]);
+         return -1;
+     }
+ 
+     if (pipe2(exec_err_pipe, O_CLOEXEC) != 0) {
+         ERROR("Failed to create pipe for exec err");
++        close(shim_stderr_pipe[0]);
++        close(shim_stderr_pipe[1]);
++        close(shim_stdout_pipe[0]);
++        close(shim_stdout_pipe[1]);
+         return -1;
+     }
+ 
+-- 
+2.34.1
+