589a0afa8c
By default, if a user requests a bind mount it uses private propagation. When the source path is a path within the daemon root this, along with some other propagation values that the user can use, causes issues when the daemon tries to remove a mountpoint because a container will then have a private reference to that mount which prevents removal. Unmouting with MNT_DETATCH can help this scenario on newer kernels, but ultimately this is just covering up the problem and doesn't actually free up the underlying resources until all references are destroyed. This change does essentially 2 things: 1. Change the default propagation when unspecified to `rslave` when the source path is within the daemon root path or a parent of the daemon root (because everything is using rbinds). 2. Creates a validation error on create when the user tries to specify an unacceptable propagation mode for these paths... basically the only two acceptable modes are `rslave` and `rshared`. In cases where we have used the new default propagation but the underlying filesystem is not setup to handle it (fs must hvae at least rshared propagation) instead of erroring out like we normally would, this falls back to the old default mode of `private`, which preserves backwards compatibility. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
36 lines
1.3 KiB
Go
36 lines
1.3 KiB
Go
package daemon
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types/mount"
|
|
"github.com/docker/docker/errdefs"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// validateBindDaemonRoot ensures that if a given mountpoint's source is within
|
|
// the daemon root path, that the propagation is setup to prevent a container
|
|
// from holding private refereneces to a mount within the daemon root, which
|
|
// can cause issues when the daemon attempts to remove the mountpoint.
|
|
func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) {
|
|
if m.Type != mount.TypeBind {
|
|
return false, nil
|
|
}
|
|
|
|
// check if the source is within the daemon root, or if the daemon root is within the source
|
|
if !strings.HasPrefix(m.Source, daemon.root) && !strings.HasPrefix(daemon.root, m.Source) {
|
|
return false, nil
|
|
}
|
|
|
|
if m.BindOptions == nil {
|
|
return true, nil
|
|
}
|
|
|
|
switch m.BindOptions.Propagation {
|
|
case mount.PropagationRSlave, mount.PropagationRShared, "":
|
|
return m.BindOptions.Propagation == "", nil
|
|
default:
|
|
}
|
|
|
|
return false, errdefs.InvalidParameter(errors.Errorf(`invalid mount config: must use either propagation mode "rslave" or "rshared" when mount source is within the daemon root, daemon root: %q, bind mount source: %q, propagation: %q`, daemon.root, m.Source, m.BindOptions.Propagation))
|
|
}
|