!69 [sync] PR-67: containerd:fix k8s build fail without import context

From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian, @Vanient 
Signed-off-by: @duguhaotian

containerd.spec

@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.2.0
 Name:           containerd
-Release:        307
+Release:        308
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -55,6 +55,12 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr
 %{_bindir}/ctr
 
 %changelog
+* Thu Dec 16 2022 zhongjiawei<zhongjiawei1@huawei.com> - 1.2.0-308
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix k8s build fail without import context
+
 * Tue Dec 13 2022 zhongjiawei<zhongjiawei1@huawei.com> - 1.2.0-307
 - Type:bugfix
 - ID:NA

git-commit

@@ -1 +1 @@
-3085d60635563122919063f97af58b92e352fe93
+2fe372726b7fdec5320b179aadab1e8ad5c0b6eb

patch/0094-containerd-Fix-goroutine-leak-in-Exec.patch

@@ -1,20 +1,41 @@
-From 02d2ff546e0727d57bcd14b73aafcc23961b8304 Mon Sep 17 00:00:00 2001
+From 13c66a426dcbb0ecef601c386b116ad7a960896a Mon Sep 17 00:00:00 2001
-From: zhongjiawei <zhongjiawei1@huawei.com>
+From: Danny Canter <danny@dcantah.dev>
-Date: Tue, 13 Dec 2022 11:22:07 +0800
+Date: Mon, 28 Nov 2022 14:45:34 -0800
-Subject: [PATCH] containerd:Fix goroutine leak in Exec
+Subject: [PATCH] CRI stream server: Fix goroutine leak in Exec
 
-Conflict:NA
+In the CRI streaming server, a goroutine (`handleResizeEvents`) is launched
-Reference:https://github.com/containerd/containerd/commit/a05d175400b1145e5e6a735a6710579d181e7fb0 
+to handle terminal resize events if a TTY is asked for with an exec; this
-Signed-off-by:  mcgowan <derek@mcg.dev>
+is the sender of terminal resize events. Another goroutine is launched
+shortly after successful process startup to actually do something with
+these events, however the issue arises if the exec process fails to start
+for any reason that would have `process.Start` return non-nil. The receiver
+goroutine never gets launched so the sender is stuck blocked on a channel send
+infinitely.
+
+This could be used in a malicious manner by repeatedly launching execs
+with a command that doesn't exist in the image, as a single goroutine
+will get leaked on every invocation which will slowly grow containerd's
+memory usage.
+
+Signed-off-by: Danny Canter <danny@dcantah.dev>
+(cherry picked from commit f012617edfd887a29345888d65640a7ccd7c72ce)
 ---
- .../pkg/kubelet/server/remotecommand/httpstream.go | 14 +++++++++++---
+ .../kubelet/server/remotecommand/httpstream.go    | 15 ++++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
-index 387ad3d..0da6f99 100644
+index 387ad3d5a..9591a5426 100644
 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
 +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/server/remotecommand/httpstream.go
-@@ -116,7 +116,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
+@@ -17,6 +17,7 @@ limitations under the License.
+ package remotecommand
+ 
+ import (
++	gocontext "context"
+ 	"encoding/json"
+ 	"errors"
+ 	"fmt"
+@@ -116,7 +117,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
  
  	if ctx.resizeStream != nil {
  		ctx.resizeChan = make(chan remotecommand.TerminalSize)
@@ -23,7 +44,7 @@ index 387ad3d..0da6f99 100644
  	}
  
  	return ctx, true
-@@ -410,7 +410,7 @@ WaitForStreams:
+@@ -410,7 +411,7 @@ WaitForStreams:
  // supportsTerminalResizing returns false because v1ProtocolHandler doesn't support it.
  func (*v1ProtocolHandler) supportsTerminalResizing() bool { return false }
  
@@ -32,7 +53,7 @@ index 387ad3d..0da6f99 100644
  	defer runtime.HandleCrash()
  
  	decoder := json.NewDecoder(stream)
-@@ -419,7 +419,15 @@ func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalS
+@@ -419,7 +420,15 @@ func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalS
  		if err := decoder.Decode(&size); err != nil {
  			break
  		}