From e312b48b011cf6e38d34fea5d826d16a18cb8702 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 22 Sep 2017 14:20:49 -0700 Subject: [PATCH] app-emulation/docker: apply ebusy overlayfs patch See https://github.com/coreos/bugs/issues/2127 and https://github.com/moby/moby/issues/34672 for discussion. Patch files have been split into more folders, plus some manual eapply calls, to allow moby/moby patches to be used unmodified against docker-ce --- ...6.2-r2.ebuild => docker-17.06.2-r3.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 9 +- .../allow-override-build-date.patch | 0 ...revert-make-overlay-home-dir-private.patch | 111 ++++++++++++++++++ 4 files changed, 119 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.06.2-r2.ebuild => docker-17.06.2-r3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/{ => patches}/allow-override-build-date.patch (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/engine/revert-make-overlay-home-dir-private.patch diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index bc05b480d6..176cc81773 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -75,8 +75,11 @@ RESTRICT="installsources strip" S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}" PATCHES=( - "${FILESDIR}/allow-override-build-date.patch" + "${FILESDIR}/patches/allow-override-build-date.patch" ) +# Note: patches in the 'engine' subfolder are automatically applied to the +# engine component; because docker-ce has subfolders for each component, +# backporting specific component's patches has this extra complexity # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" @@ -212,6 +215,10 @@ src_unpack() { DOCKER_GITCOMMIT=$(git -C "${S}" rev-parse HEAD | head -c 7) DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct") fi + pushd "${S}"/components/engine || die + EPATCH_SOURCE="${FILESDIR}/patches/engine" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + popd || die } src_compile() { diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/allow-override-build-date.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/allow-override-build-date.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/allow-override-build-date.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/allow-override-build-date.patch diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/engine/revert-make-overlay-home-dir-private.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/engine/revert-make-overlay-home-dir-private.patch new file mode 100644 index 0000000000..7a21b2c3ff --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/patches/engine/revert-make-overlay-home-dir-private.patch @@ -0,0 +1,111 @@ +From 699fab4877c3ff5d7f935bd3977e413c31269c7c Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Fri, 22 Sep 2017 12:01:04 -0700 +Subject: [PATCH] Revert "Make overlay home dir Private mount" + +This reverts commit e076bccb458aeadab9380ce0636456ad6317a85f. +It also reverts it for the overlay2 package, which didn't exist at the +time the commit was made but is a direct successor with copy-pasted +code. + +The original commit was meant to fix a bug whereby `docker cp` +(implemented via chrootarchive) could inadvertantly lead to shared +mounts getting unmounted on the host too. + +The fix, however, had side effects. It results in overlay mounts being +private, and thus being quite easy to leak copies that are hard to +umount into other mount namespaces on the box. + +This hasn't been noticed until now because on kernels prior to v4.13, +temporarily leaking overlayfs mounts to other namespaces didn't have any +ill effects. + +Starting with v4.13, setting the mount to private and thus leaking +mounts results in errors. See https://github.com/moby/moby/issues/34672 + +The correct fix for the original issue was implemented later in +https://github.com/moby/moby/pull/27609, and since that code is now +merged we can safely throw away this less ideal fix. + +Signed-off-by: Euan Kemp +--- + daemon/graphdriver/overlay/overlay.go | 12 +++--------- + daemon/graphdriver/overlay2/overlay.go | 12 +++--------- + 2 files changed, 6 insertions(+), 18 deletions(-) + +diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go +index 9012722c20d..8ed51e6c384 100644 +--- a/daemon/graphdriver/overlay/overlay.go ++++ b/daemon/graphdriver/overlay/overlay.go +@@ -19,7 +19,6 @@ import ( + "github.com/docker/docker/pkg/fsutils" + "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/pkg/locker" +- "github.com/docker/docker/pkg/mount" + "github.com/docker/docker/pkg/system" + "github.com/opencontainers/selinux/go-selinux/label" + "github.com/sirupsen/logrus" +@@ -139,10 +138,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap + return nil, err + } + +- if err := mount.MakePrivate(home); err != nil { +- return nil, err +- } +- + supportsDType, err := fsutils.SupportsDType(home) + if err != nil { + return nil, err +@@ -227,11 +222,10 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) { + return metadata, nil + } + +-// Cleanup any state created by overlay which should be cleaned when daemon +-// is being shutdown. For now, we just have to unmount the bind mounted +-// we had created. ++// Cleanup simply returns nil and do not change the existing filesystem. ++// This is required to satisfy the graphdriver.Driver interface. + func (d *Driver) Cleanup() error { +- return mount.Unmount(d.home) ++ return nil + } + + // CreateReadWrite creates a layer that is writable for use as a container +diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go +index f350ca9c0b8..5aaf8c0cefe 100644 +--- a/daemon/graphdriver/overlay2/overlay.go ++++ b/daemon/graphdriver/overlay2/overlay.go +@@ -28,7 +28,6 @@ import ( + "github.com/docker/docker/pkg/fsutils" + "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/pkg/locker" +- "github.com/docker/docker/pkg/mount" + "github.com/docker/docker/pkg/parsers" + "github.com/docker/docker/pkg/parsers/kernel" + "github.com/docker/docker/pkg/system" +@@ -175,10 +174,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap + return nil, err + } + +- if err := mount.MakePrivate(home); err != nil { +- return nil, err +- } +- + supportsDType, err := fsutils.SupportsDType(home) + if err != nil { + return nil, err +@@ -314,11 +309,10 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) { + return metadata, nil + } + +-// Cleanup any state created by overlay which should be cleaned when daemon +-// is being shutdown. For now, we just have to unmount the bind mounted +-// we had created. ++// Cleanup simply returns nil and do not change the existing filesystem. ++// This is required to satisfy the graphdriver.Driver interface. + func (d *Driver) Cleanup() error { +- return mount.Unmount(d.home) ++ return nil + } + + // CreateReadWrite creates a layer that is writable for use as a container