From c24404bc744307b587d586d99f8058ea5291b1c3 Mon Sep 17 00:00:00 2001
From: zhongjiawei <zhongjiawei1@huawei.com>
Date: Fri, 30 Aug 2024 16:02:32 +0800
Subject: [PATCH] runc:format log instead panic when procError missing payload

---
 git-commit                                    |  2 +-
 ...instead-panic-when-procError-missing.patch | 25 +++++++++++++++++++
 runc.spec                                     |  8 +++++-
 series.conf                                   |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 patch/0044-runc-format-log-instead-panic-when-procError-missing.patch

diff --git a/git-commit b/git-commit
index 6f86182..ebb5ea7 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-f96899740a738303176d8f2d08881d42eadc2ee0
+b5df7029488e0b42b65b5df8e23c7bd9e8884099
diff --git a/patch/0044-runc-format-log-instead-panic-when-procError-missing.patch b/patch/0044-runc-format-log-instead-panic-when-procError-missing.patch
new file mode 100644
index 0000000..5699852
--- /dev/null
+++ b/patch/0044-runc-format-log-instead-panic-when-procError-missing.patch
@@ -0,0 +1,25 @@
+From 46b7c30e013c15fc254a17e5151f05c99da6def4 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Fri, 30 Aug 2024 15:55:15 +0800
+Subject: [PATCH] runc:format log instead panic when procError missing payload
+
+---
+ libcontainer/sync.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcontainer/sync.go b/libcontainer/sync.go
+index 25dc286..e6029fd 100644
+--- a/libcontainer/sync.go
++++ b/libcontainer/sync.go
+@@ -115,7 +115,7 @@ func parseSync(pipe io.Reader, fn func(*syncT) error) error {
+ 				return ierr
+ 			}
+ 			// Programmer error.
+-			panic("No error following JSON procError payload.")
++			return errors.New("procError missing error payload")
+ 		}
+ 
+ 		if err := fn(&sync); err != nil {
+-- 
+2.33.0
+
diff --git a/runc.spec b/runc.spec
index fe9b51e..aeed2a8 100644
--- a/runc.spec
+++ b/runc.spec
@@ -3,7 +3,7 @@
 
 Name: runc
 Version: 1.1.8
-Release: 17
+Release: 20
 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification.
 
 License: ASL 2.0
@@ -57,6 +57,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc
 %{_bindir}/runc
 
 %changelog
+* Fri Aug 30 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.8-20
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:format log instead panic when procError missing payload
+
 * Mon Jul 15 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.8-17
 - Type:bugfix
 - CVE:NA
diff --git a/series.conf b/series.conf
index 9546ca3..593edb6 100644
--- a/series.conf
+++ b/series.conf
@@ -39,3 +39,4 @@ patch/0039-runc-fix-CVE-2024-3154.patch
 patch/0040-add-loongarch64-seccomp-support.patch
 patch/0042-runc-fix-a-data-race.patch
 patch/0043-runc-do-not-support-set-umask-through-native.umask.patch
+patch/0044-runc-format-log-instead-panic-when-procError-missing.patch
-- 
Gitee