fix: re-validate container status under lock before delete (TOCTOU)#1860
Open
radheradhe01 wants to merge 1 commit into
Open
fix: re-validate container status under lock before delete (TOCTOU)#1860radheradhe01 wants to merge 1 commit into
radheradhe01 wants to merge 1 commit into
Conversation
### Problem
`ContainersService.delete` reads the container status **outside** the lock:
```swift
let state = try self._getContainerState(id: id) // unlocked read
switch state.snapshot.status {
...
default:
try await self.lock.withLock { context in
try await self.cleanUp(id: id, context: context) // no status re-check
}
}
```
`startProcess` holds the same lock while transitioning a container to `.running` and writing the state back. Between the unlocked read here and acquiring the lock, a container observed as stopped can start. `cleanUp` only guards on `containers[id] == nil`, not status, so it then deletes the bundle of a now-running container (TOCTOU).
### Fix
Re-read the status **inside** the lock in the `default` branch and refuse the delete if the container has since become `.running`/`.stopping`, mirroring the existing message used for the non-forced running case.
### Notes
Only the non-forced delete path changes; the `--force` path is unchanged.
radheradhe01
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type of Change
Motivation and Context
ContainersService.deletereads the container status outside the lock, then in thedefaultbranch acquires the lock and callscleanUpwithout re-checking status.startProcessholds the same lock while transitioning a container to.runningand writing the state back. Between the unlocked read and acquiring the lock, a container observed as stopped can start;cleanUponly guards oncontainers[id] == nil, not status, so it then deletes the bundle of a now-running container (TOCTOU).This change re-reads the status inside the lock in the
defaultbranch and refuses the delete if the container has since become.running/.stopping, mirroring the existing message used for the non-forced running case. Only the non-forced delete path changes; the--forcepath is unchanged.Testing
Verified by static / code-level review; not built locally (no macOS 26 toolchain available here) — CI build will validate.