diff --git a/git-commit b/git-commit index 92d8930d80524c3b323e809f3a260a1dbd7091d6..0ae824605f5181a5283ce1728e6c2a98b618ef73 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -1251c89d252bb9f8136d47c5892497829e78683f +ae908e306b8682a184ba191e4a810afe367c607c diff --git a/patch/0059-runc-fix-can-t-set-cpuset-cpus-and-cpuset-mems-at-th.patch b/patch/0059-runc-fix-can-t-set-cpuset-cpus-and-cpuset-mems-at-th.patch new file mode 100644 index 0000000000000000000000000000000000000000..37aeeec2528635eddc94e2488216fcbb1b01cc6f --- /dev/null +++ b/patch/0059-runc-fix-can-t-set-cpuset-cpus-and-cpuset-mems-at-th.patch @@ -0,0 +1,28 @@ +From 29a2bfe1e6197dd79a02e4e2a443ba21bc80c080 Mon Sep 17 00:00:00 2001 +From: zhongjiawei +Date: Sun, 29 Sep 2024 15:01:34 +0800 +Subject: [PATCH] runc:fix can't set cpuset-cpus and cpuset-mems at the same + time + +--- + libcontainer/cgroups/fs/cpuset.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go +index 379407e..22b9011 100644 +--- a/libcontainer/cgroups/fs/cpuset.go ++++ b/libcontainer/cgroups/fs/cpuset.go +@@ -146,7 +146,9 @@ func (s *CpusetGroup) setCpuset(path, cpuset string) error { + func (s *CpusetGroup) Set(path string, r *configs.Resources) error { + var ret error + if r.CpusetCpus != "" { +- return s.setCpuset(path, r.CpusetCpus) ++ if err := s.setCpuset(path, r.CpusetCpus); err != nil { ++ return err ++ } + } + if r.CpusetMems != "" { + if err := cgroups.WriteFile(path, "cpuset.mems", r.CpusetMems); err != nil { +-- +2.33.0 + diff --git a/runc.spec b/runc.spec index 9d65e696c66462116d0b0fac47d72e2f7e3fc114..7768a9d4fc0c048d27286959498996a772f7b8f0 100644 --- a/runc.spec +++ b/runc.spec @@ -3,7 +3,7 @@ Name: runc Version: 1.1.3 -Release: 30 +Release: 31 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -54,6 +54,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Sun Sep 29 2024 zhongjiawei - 1.1.3-31 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix can't set cpuset-cpus and cpuset-mems at the same time + * Tue Sep 10 2024 Song Zhang - 1.1.3-30 - Type:CVE - CVE:CVE-2024-45310 diff --git a/series.conf b/series.conf index f6d29d3c1acdd01ba89e393876ef9fbce83e5d31..67c4bba5e76c87c3e79fc2e9ea3dc58282052791 100644 --- a/series.conf +++ b/series.conf @@ -56,3 +56,4 @@ patch/0055-runc-do-not-support-set-umask-through-native.umask.patch patch/0056-runc-format-log-instead-panic-when-procError-missing.patch patch/0057-rootfs-consolidate-mountpoint-creation-logic.patch patch/0058-rootfs-try-to-scope-MkdirAll-to-stay-inside-the-root.patch +patch/0059-runc-fix-can-t-set-cpuset-cpus-and-cpuset-mems-at-th.patch