Skip to content

[master] Check contexts before importing them to reduce risk of extracted files escaping context store#2955

Merged
silvin-lubecki merged 3 commits intodocker:masterfrom
thaJeztah:master_context_check
Feb 2, 2021
Merged

[master] Check contexts before importing them to reduce risk of extracted files escaping context store#2955
silvin-lubecki merged 3 commits intodocker:masterfrom
thaJeztah:master_context_check

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

These changes are already included in the v20.10.3 and v19.03.15 security releases, and this PR forwards those changes to the master branch

cherry-pick was clean

git cherry-pick -s -S -x 6f49197 9ecc69d 18f33b3

Signed-off-by: Chris Crone <[email protected]>
(cherry picked from commit 6f49197)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Chris Crone <[email protected]>
(cherry picked from commit 9ecc69d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Chris Crone <[email protected]>
(cherry picked from commit 18f33b3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Copy link
Copy Markdown
Member

@chris-crone chris-crone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit 70a0015 into docker:master Feb 2, 2021
@thaJeztah thaJeztah deleted the master_context_check branch February 2, 2021 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants