diff --git a/git-commit b/git-commit index 085687f31d7984291311da587f8903c7e8d55874..ebb5ea768e827c2d6b2f5b13234181150a0182a3 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -593dbd81f34d8d33d46906c17cb07c4011956cea +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 0000000000000000000000000000000000000000..5699852c780837c96c4b8bff95649abab735b6a5 --- /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 +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 b5a0810976b68d4a9c9b2f86b8012106075493c5..b963fb732bc0f0a050eb7840a75f53a894550900 100644 --- a/runc.spec +++ b/runc.spec @@ -3,7 +3,7 @@ Name: runc Version: 1.1.8 -Release: 19 +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 - 1.1.8-20 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:format log instead panic when procError missing payload + * Thu Jul 11 2024 zhongjiawei - 1.1.8-19 - Type:bugfix - CVE:NA diff --git a/series.conf b/series.conf index 7277032fd7df92bf67b157614db3bbd67353b212..18875dde46b188985f6bc356667c3fd9d68f0a2e 100644 --- a/series.conf +++ b/series.conf @@ -40,3 +40,4 @@ patch/0040-add-loongarch64-seccomp-support.patch patch/0041-runc-Set-temporary-single-CPU-affinity-before-cgroup-cpus.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