diff --git a/docker.spec b/docker.spec index 4e27959a61c6b68d72eecd94997efa817fcf2cdb..2b5d7832ff352afec913af212edb313cc0143a06 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 115 +Release: 116 Summary: The open-source application container engine Group: Tools/Docker @@ -211,6 +211,12 @@ fi %endif %changelog +* Mon Aug 30 2021 wangfengtu - 18.09.0-116 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix dangling unpigz + * Thu Apr 01 2021 wangfengtu - 18.09.0-115 - Type:bugfix - CVE:NA diff --git a/patch/0192-fix-dangling-unpigz.patch b/patch/0192-fix-dangling-unpigz.patch new file mode 100644 index 0000000000000000000000000000000000000000..11d452bb992e38ce8ccd8bba08b7533d0bb4bd6f --- /dev/null +++ b/patch/0192-fix-dangling-unpigz.patch @@ -0,0 +1,25 @@ +From 6926d4e842dc26043cbdd38de5a8c0776f0d4d43 Mon Sep 17 00:00:00 2001 +From: WangFengTu +Date: Sun, 29 Aug 2021 15:49:03 +0800 +Subject: [PATCH] fix dangling unpigz + +Signed-off-by: WangFengTu +--- + components/engine/builder/dockerfile/copy.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/components/engine/builder/dockerfile/copy.go b/components/engine/builder/dockerfile/copy.go +index ad9b08df..c323e703 100644 +--- a/components/engine/builder/dockerfile/copy.go ++++ b/components/engine/builder/dockerfile/copy.go +@@ -527,6 +527,7 @@ func isArchivePath(driver containerfs.ContainerFS, path string) bool { + if err != nil { + return false + } ++ defer rdr.Close() + r := tar.NewReader(rdr) + _, err = r.Next() + return err == nil +-- +2.25.1 + diff --git a/series.conf b/series.conf index 09b3213be6a648ec9af744991e67064359dd70fa..1db42f0f7618e476173b84e6d417c75ac3816b8f 100644 --- a/series.conf +++ b/series.conf @@ -189,4 +189,5 @@ patch/0188-docker-check-containerd-pid-before-kill-it.patch patch/0189-docker-fix-Access-to-remapped-root-allows-privilege-.patch patch/0190-docker-fix-CVE-2021-21285.patch patch/0191-rollback-if-docker-restart-when-doing-BlkDiscard.patch +patch/0192-fix-dangling-unpigz.patch #end