!274 runc:sync some patches

From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234

git-commit

@@ -1 +1 @@
-288b7252b0db60842f5d7e1b9716c84c98f4ea30
+39ef8dd8b1069e96008306023d05d2f84c435fff

patch/0042-runc-fix-a-data-race.patch

@@ -0,0 +1,26 @@
+From d1ef3ab619c7743d389fc882ec65df38d140fc08 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Mon, 17 Jun 2024 23:22:39 +0800
+Subject: [PATCH] libct/config: fix a data race
+
+Reference:https://github.com/opencontainers/runc/commit/c342872276d4a3d5f662684115e282cbb20bf227
+---
+ libcontainer/configs/config.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcontainer/configs/config.go b/libcontainer/configs/config.go
+index f85ade3f..c9ecc3cb 100644
+--- a/libcontainer/configs/config.go
++++ b/libcontainer/configs/config.go
+@@ -455,7 +455,7 @@ func (c Command) Run(s *specs.State) error {
+ 			return err
+ 		case <-timerCh:
+ 			cmd.Process.Kill()
+-			cmd.Wait()
++			<-errC
+ 			return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds())
+ 		case <-timeAfter:
+ 			if c.Timeout != nil {
+-- 
+2.33.0
+

runc.spec

@@ -3,7 +3,7 @@
 
 Name: runc
 Version: 1.1.8
-Release: 17
+Release: 18
 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
+* Wed Jun 19 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.8-18
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:sync some patches
+
 * Fri Jun 14 2024 zhaixiaojuan<zhaixiaojuan@loongson.cn> - 1.1.8-17
 - Type:bugfix
 - CVE:NA

series.conf

@@ -37,3 +37,5 @@ patch/0037-runc-fix-CVE-2024-21626.patch
 patch/0038-runc-check-cmd-exist.patch
 patch/0039-runc-fix-CVE-2024-3154.patch
 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