beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: daemon.prepareMountPoints(): fix panic if mount is not a volume

Browse source 
The daemon.lazyInitializeVolume() function only handles restoring Volumes
if a Driver is specified. The Container's MountPoints field may also
contain other kind of mounts (e.g., bind-mounts). Those were ignored, and
don't return an error; 1d9c8619cd/daemon/volumes.go (L243-L252C2)

However, the prepareMountPoints() assumed each MountPoint was a volume,
and logged an informational message about the volume being restored;
1d9c8619cd/daemon/mounts.go (L18-L25)

This would panic if the MountPoint was not a volume;

    github.com/docker/docker/daemon.(*Daemon).prepareMountPoints(0xc00054b7b8?, 0xc0007c2500)
            /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/mounts.go:24 +0x1c0
    github.com/docker/docker/daemon.(*Daemon).restore.func5(0xc0007c2500, 0x0?)
            /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/daemon.go:552 +0x271
    created by github.com/docker/docker/daemon.(*Daemon).restore
            /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/daemon.go:530 +0x8d8
    panic: runtime error: invalid memory address or nil pointer dereference
    [signal SIGSEGV: segmentation violation code=0x1 addr=0x30 pc=0x564e9be4c7c0]

This issue was introduced in 647c2a6cdd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a490248f4d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-07 14:54:04 +02:00
parent 1d9c8619cd
commit d3893b58ff
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/mounts.go
View file

@ -18,6 +18,10 @@ func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
if err := daemon.lazyInitializeVolume(container.ID, config); err != nil { if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
return err return err
} }
if config.Volume == nil {
// FIXME(thaJeztah): should we check for config.Type here as well? (i.e., skip bind-mounts etc)
continue
}
if alive { if alive {
log.G(context.TODO()).WithFields(logrus.Fields{ log.G(context.TODO()).WithFields(logrus.Fields{
"container": container.ID, "container": container.ID,

18
integration/daemon/daemon_test.go
View file

@ -436,6 +436,24 @@ func testLiveRestoreVolumeReferences(t *testing.T) {
err = c.VolumeRemove(ctx, v.Name, false) err = c.VolumeRemove(ctx, v.Name, false)
assert.NilError(t, err) assert.NilError(t, err)
}) })
// Make sure that we don't panic if the container has bind-mounts
// (which should not be "restored")
// Regression test for https://github.com/moby/moby/issues/45898
t.Run("container with bind-mounts", func(t *testing.T) {
m := mount.Mount{
Type: mount.TypeBind,
Source: os.TempDir(),
Target: "/foo",
}
cID := container.Run(ctx, t, c, container.WithMount(m), container.WithCmd("top"))
defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})
d.Restart(t, "--live-restore", "--iptables=false")
err := c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})
assert.NilError(t, err)
})
} }
func TestDaemonDefaultBridgeWithFixedCidrButNoBip(t *testing.T) { func TestDaemonDefaultBridgeWithFixedCidrButNoBip(t *testing.T) {