From 536aa8d8eb06241b258258c64e0cd3393e47b524 Mon Sep 17 00:00:00 2001
From: Lu Jingxiao <lujingxiao@huawei.com>
Date: Fri, 1 Mar 2024 18:19:44 +0800
Subject: [PATCH] cio: FIFOSet.Close() check if FIFOSet is nill to prevent NPE

Reference:https://github.com/containerd/containerd/commit/6a2d3990d1db676935ea7d1d2f8e2b952998b5d9

Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>
---
 containerd.spec                               |  8 +++++-
 git-commit                                    |  2 +-
 ...e-check-if-FIFOSet-is-nill-to-preven.patch | 26 +++++++++++++++++++
 series.conf                                   |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 patch/0035-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch

diff --git a/containerd.spec b/containerd.spec
index 2987cff..f84f555 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.6.22
 Name:           containerd
-Release:        7
+Release:        8
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -67,6 +67,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %exclude %{_bindir}/containerd-stress
 
 %changelog
+* Fri Mar 1 2024 Lu Jingxiao<lujingxiao@huawei.com> - 1.6.22-8
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:FIFOSet.Close() check if FIFOSet is nill to prevent NPE
+
 * Fri Feb 23 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.6.22-7
 - Type:bugfix
 - ID:NA
diff --git a/git-commit b/git-commit
index cf35c11..ab11dda 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-d85f40f15ded290c1da3817b33290932c021457f
+947326472d332f5f9e17913790d882ec06f1a7cf
diff --git a/patch/0035-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch b/patch/0035-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch
new file mode 100644
index 0000000..9bb364c
--- /dev/null
+++ b/patch/0035-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch
@@ -0,0 +1,26 @@
+From 38f756e73afaedae43d5d53e4731cf9ea45b8e5d Mon Sep 17 00:00:00 2001
+From: Sebastiaan van Stijn <github@gone.nl>
+Date: Thu, 29 Feb 2024 19:52:14 +0800
+Subject: [PATCH] cio: FIFOSet.Close() check if FIFOSet is nill to prevent NPE
+
+Reference:https://github.com/containerd/containerd/commit/6a2d3990d1db676935ea7d1d2f8e2b952998b5d9
+---
+ cio/io.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cio/io.go b/cio/io.go
+index bda04d2..dcf40aa 100644
+--- a/cio/io.go
++++ b/cio/io.go
+@@ -77,7 +77,7 @@ type FIFOSet struct {
+ 
+ // Close the FIFOSet
+ func (f *FIFOSet) Close() error {
+-	if f.close != nil {
++	if f != nil && f.close != nil {
+ 		return f.close()
+ 	}
+ 	return nil
+-- 
+2.33.0
+
diff --git a/series.conf b/series.conf
index 5e0d338..d25a476 100644
--- a/series.conf
+++ b/series.conf
@@ -32,3 +32,4 @@ patch/0031-containerd-fix-some-containerd-bug.patch
 patch/0032-containerd-vendor-golang.org-x-net-v0.17.0.patch
 patch/0033-containerd-Fix-missing-closed-fifo.patch
 patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch
+patch/0035-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch
-- 
Gitee