diff --git a/containerd.spec b/containerd.spec index d4a0e4791f6a3d12462fe2901a83e8947fa09ae1..3fff3d47cbe0fad6a093837fc63de2fe3085082c 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.2.0 Name: containerd -Release: 318 +Release: 319 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -63,6 +63,12 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr %{_bindir}/ctr %changelog +* Mon Mar 4 2024 Lu Jingxiao - 1.2.0-319 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:FIFOSet.Close() check if FIFOSet is nill to prevent NPE + * Fri Feb 23 2024 zhongjiawei - 1.2.0-318 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index 3cf2d7e200676ea2463c689d9c172cd9f1177f98..111b0e5bc2c4a7f9f2180759b45c0823248eac86 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -03dd19b172a5ecece6fe3fba8bb241ffaac7deac +871075eb7cc979944ba2d987719cb534bbb87e5c diff --git a/patch/0112-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch b/patch/0112-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch new file mode 100644 index 0000000000000000000000000000000000000000..9bb364c18ca09cdbdfd925e532e7c152819854d8 --- /dev/null +++ b/patch/0112-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 +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 a43aaf69465853452133da33ec07e0d382a1eac5..b1ba9b40450e92a6a6536f8bfa1f8ea7df42c483 100644 --- a/series.conf +++ b/series.conf @@ -117,4 +117,5 @@ patch/0108-containerd-Update-TTRPC-and-Protobuild-dependencies.patch patch/0109-containerd-Backport-net-http-regenerate-h2_bundle.go.patch patch/0110-containerd-update-vendored-golang.org-x-net.patch patch/0111-containerd-disable-Transparent-HugePage-for-shim-pro.patch +patch/0112-containerd-cio-FIFOSet.Close-check-if-FIFOSet-is-nill-to-preven.patch # end