tests/int: don't remove a directory we did not create - #5445
Open
kolyshkin wants to merge 2 commits into
Open
Conversation
Here, ROOT is the root of the runc source tree, while in the integration tests ROOT is a temporary directory which teardown_bundle removes recursively. The variable is not exported, so nothing is broken today, but the name clash is a trap waiting to happen; use a distinct name. Signed-off-by: Kir Kolyshkin <[email protected]>
teardown_bundle removes $ROOT recursively, guarded only by a check that the variable is set. Since ROOT can be inherited from the environment (setup_bundle overwrites it, but is not called by every test), a stray ROOT in the environment makes the teardown remove an arbitrary directory. Please don't ask me how I know all this. Add some protection: - helpers.bash now unsets ROOT if it comes from the environment; - setup_bundle marks the directory it creates with a marker file, and teardown_bundle only removes a directory which has that marker and is located under $BATS_RUN_TMPDIR. Signed-off-by: Kir Kolyshkin <[email protected]>
AkihiroSuda
approved these changes
Sep 4, 2026
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
2 participants
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.
teardown_bundle removes $ROOT recursively, guarded only by a check that
the variable is set. Since ROOT can be inherited from the environment
(setup_bundle overwrites it, but is not called by every test), a stray
ROOT in the environment makes the teardown remove an arbitrary
directory. Please don't ask me how I know all this.
Add some protection:
teardown_bundle only removes a directory which has that marker and
is located under $BATS_RUN_TMPDIR.