From 2dd30e26d74120a869231e2b532e34065778cf73 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Thu, 13 Jul 2023 11:39:58 +0800 Subject: [PATCH] docker: repalce unix.Rmdir with os.RemoveAll when remove mount point dir fix #I7G1LL --- VERSION-vendor | 2 +- docker.spec | 8 +++- git-commit | 2 +- ...nix.Rmdir-with-os.RemoveAll-when-rem.patch | 38 +++++++++++++++++++ series.conf | 1 + 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 patch/0260-docker-repalce-unix.Rmdir-with-os.RemoveAll-when-rem.patch diff --git a/VERSION-vendor b/VERSION-vendor index e2b32f2..6ced269 100644 --- a/VERSION-vendor +++ b/VERSION-vendor @@ -1 +1 @@ -18.09.0.326 +18.09.0.327 diff --git a/docker.spec b/docker.spec index 633fa51..469b0de 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 326 +Release: 327 Epoch: 2 Summary: The open-source application container engine Group: Tools/Docker @@ -227,6 +227,12 @@ fi %endif %changelog +* Thu Jul 13 2023 chenjiankun - 18.09.0-327 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:repalce unix.Rmdir with os.RemoveAll when remove mount point dir + * Wed Jul 12 2023 zhongjiawei - 18.09.0-326 - Type:bugfix - CVE:NA diff --git a/git-commit b/git-commit index b3ea960..ff30887 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -180dc956d2c83c92a70d6f530220f253142d53b3 +81be798ea8e46f86cf0ae2d3f93b122dfbd374a8 diff --git a/patch/0260-docker-repalce-unix.Rmdir-with-os.RemoveAll-when-rem.patch b/patch/0260-docker-repalce-unix.Rmdir-with-os.RemoveAll-when-rem.patch new file mode 100644 index 0000000..f46b328 --- /dev/null +++ b/patch/0260-docker-repalce-unix.Rmdir-with-os.RemoveAll-when-rem.patch @@ -0,0 +1,38 @@ +From 9f1aa90a8c1b3856c4bb6ec422b8f67ac5afc31e Mon Sep 17 00:00:00 2001 +From: chenjiankun +Date: Mon, 12 Jun 2023 16:09:06 +0800 +Subject: [PATCH] docker: repalce unix.Rmdir with os.RemoveAll when remove + mount point dir + +In some cases, there are some files in the mount point dir, so we can't use +unix.Rmdir to remove mount point dir. +--- + components/engine/daemon/graphdriver/devmapper/driver.go | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/components/engine/daemon/graphdriver/devmapper/driver.go b/components/engine/daemon/graphdriver/devmapper/driver.go +index 3005b84eb..a1a6e17af 100644 +--- a/components/engine/daemon/graphdriver/devmapper/driver.go ++++ b/components/engine/daemon/graphdriver/devmapper/driver.go +@@ -19,7 +19,6 @@ import ( + "github.com/docker/go-units" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" +- "golang.org/x/sys/unix" + ) + + func init() { +@@ -196,7 +195,9 @@ func (d *Driver) Remove(id string) error { + // mount point is not important and should not be treated + // as a failure to remove the container. + mp := path.Join(d.home, "mnt", id) +- err := unix.Rmdir(mp) ++ // In some cases, there are some files in the mount point dir, so we can't use ++ // unix.Rmdir to remove mount point dir. os.RemoveAll is more appropriate ++ err := os.RemoveAll(mp) + if err != nil && !os.IsNotExist(err) { + logrus.WithField("storage-driver", "devicemapper").Warnf("unable to remove mount point %q: %s", mp, err) + } +-- +2.23.0 + diff --git a/series.conf b/series.conf index 7d7c528..f78e552 100644 --- a/series.conf +++ b/series.conf @@ -257,4 +257,5 @@ patch/0256-docker-libnet-d-overlay-document-some-encryption-code.patch patch/0257-docker-libnet-d-overlay-add-BPF-powered-VNI-matcher.patch patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch patch/0259-backport-fix-blockThreshold-full-bug.patch +patch/0260-docker-repalce-unix.Rmdir-with-os.RemoveAll-when-rem.patch #end -- Gitee