!230 [sync] PR-223: runc:runc delete don't proceed in case of errors

From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234

git-commit

@@ -1 +1 @@
-32ed6f4eebcde9458c54092c578c7b852b7f79dd
+47a4bc111c776c9d4942d021420450e8c89b403e

patch/0045-runc-libct-Destroy-don-t-proceed-in-case-of-errors.patch

@@ -0,0 +1,58 @@
+From a5d5191301de25f26942c07ea4502a716755a32e Mon Sep 17 00:00:00 2001
+From: Kir Kolyshkin <kolyshkin@gmail.com>
+Date: Mon, 13 Nov 2023 15:39:21 -0800
+Subject: [PATCH] libct: Destroy: don't proceed in case of errors
+
+For some reason, container destroy operation removes container's state
+directory even if cgroup removal fails (and then still returns an
+error). It has been that way since commit 5c246d038fc47b, which added
+cgroup removal.
+
+This is problematic because once the container state dir is removed, we
+no longer know container's cgroup and thus can't remove it.
+
+Let's return the error early and fail if cgroup can't be removed.
+
+Same for other operations: do not proceed if we fail.
+
+Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
+---
+ libcontainer/state_linux.go | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/libcontainer/state_linux.go b/libcontainer/state_linux.go
+index aa6259b..81f1d85 100644
+--- a/libcontainer/state_linux.go
++++ b/libcontainer/state_linux.go
+@@ -42,19 +42,20 @@ func destroy(c *linuxContainer) error {
+ 			logrus.Warn(err)
+ 		}
+ 	}
+-	err := c.cgroupManager.Destroy()
++	if err := c.cgroupManager.Destroy(); err != nil {
++		return fmt.Errorf("unable to remove container's cgroup: %w", err)
++	}
+ 	if c.intelRdtManager != nil {
+-		if ierr := c.intelRdtManager.Destroy(); err == nil {
+-			err = ierr
++		if err := c.intelRdtManager.Destroy(); err != nil {
++			return fmt.Errorf("unable to remove container's IntelRDT group: %w", err)
+ 		}
+ 	}
+-	if rerr := os.RemoveAll(c.root); err == nil {
+-		err = rerr
++	if err := os.RemoveAll(c.root); err != nil {
++		return fmt.Errorf("unable to remove container state dir: %w", err)
+ 	}
+ 	c.initProcess = nil
+-	if herr := runPoststopHooks(c); err == nil {
+-		err = herr
+-	}
++	err := runPoststopHooks(c)
++
+ 	c.state = &stoppedState{c: c}
+ 	return err
+ }
+-- 
+2.33.0
+

runc.spec

@@ -3,7 +3,7 @@
 
 Name: docker-runc
 Version: 1.1.3
-Release: 20
+Release: 21
 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
+* Fri Dec 8 2023 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.3-21
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:libct: Destroy: don't proceed in case of errors
+
 * Mon Dec 4 2023 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.3-20
 - Type:bugfix
 - CVE:NA

series.conf

@@ -42,3 +42,4 @@ patch/0041-runc-libct-init-unify-init-fix-its-error-logic.patch
 patch/0042-runc-Handle-kmem.limit_in_bytes-removal.patch
 patch/0043-runc-fix-update-rt-runtime-us-and-rt-period-us-faile.patch
 patch/0044-runc-delete-do-not-ignore-error-from-destroy.patch
+patch/0045-runc-libct-Destroy-don-t-proceed-in-case-of-errors.patch