InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49228 from RTBHOUSE/49227-rwlayer-nil-dereference-fix

Browse Source 
Clear RWLayer reference under container lock
This commit is contained in:
Paweł Gronowski
2025-01-08 18:59:53 +01:00
committed by GitHub
parent 50212d215b 97dc3056c6
commit eefb0802c8
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/delete.go
View File

@@ -126,6 +126,10 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, config ba
container.Lock()
container.Dead = true
// Copy RWLayer for releasing and clear the reference while holding the container lock.
rwLayer := container.RWLayer
container.RWLayer = nil
// Save container state to disk. So that if error happens before
// container meta file got removed from disk, then a restart of
// docker should not make a dead container alive.
@@ -136,13 +140,17 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, config ba
// When container creation fails and `RWLayer` has not been created yet, we
// do not call `ReleaseRWLayer`
if container.RWLayer != nil {
if err := daemon.imageService.ReleaseLayer(container.RWLayer); err != nil {
if rwLayer != nil {
if err := daemon.imageService.ReleaseLayer(rwLayer); err != nil {
// Restore the reference on error as it possibly was not released.
container.Lock()
container.RWLayer = rwLayer
container.Unlock()
err = errors.Wrapf(err, "container %s", container.ID)
container.SetRemovalError(err)
return err
}
container.RWLayer = nil
} else {
if daemon.UsesSnapshotter() {
ls := daemon.containerdClient.LeasesService()