Skip to content

[1.2] deps: update to github.com/cyphar/filepath-securejoin@v0.3.5#4550

Merged
lifubang merged 2 commits intoopencontainers:release-1.2from
cyphar:1.2-racing-mkdirall
Dec 8, 2024
Merged

[1.2] deps: update to github.com/cyphar/filepath-securejoin@v0.3.5#4550
lifubang merged 2 commits intoopencontainers:release-1.2from
cyphar:1.2-racing-mkdirall

Conversation

@cyphar
Copy link
Copy Markdown
Member

@cyphar cyphar commented Dec 7, 2024

Backport of #4549. Note that github.com/cyphar/filepath-securejoin@v0.3.5 includes a dependency update of golang.org/x/sys@v0.28.0 which I've split into a separate commit.


This fixes a regression in use of securejoin.MkdirAll, where multiple
runc processes racing to create the same mountpoint in a shared rootfs
would result in spurious EEXIST errors. In particular, this regression
caused issues with BuildKit.

Fixes: dd827f7 ("utils: switch to securejoin.MkdirAllHandle")
Fixes #4543
Signed-off-by: Aleksa Sarai cyphar@cyphar.com

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(This is a cherry-pick of 2f1b662.)

This fixes a regression in use of securejoin.MkdirAll, where multiple
runc processes racing to create the same mountpoint in a shared rootfs
would result in spurious EEXIST errors. In particular, this regression
caused issues with BuildKit.

Fixes: dd827f7 ("utils: switch to securejoin.MkdirAllHandle")
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
@cyphar cyphar added the backport/1.2-pr A backport PR to release-1.2 label Dec 7, 2024
@cyphar cyphar added this to the 1.2.3 milestone Dec 7, 2024
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@lifubang
Copy link
Copy Markdown
Member

lifubang commented Dec 7, 2024

I think maybe we should update the PR description to say why we need to update deps: update to golang.org/x/sys@v0.28.0?

@cyphar
Copy link
Copy Markdown
Member Author

cyphar commented Dec 7, 2024

@lifubang The filepath-securejoin update forces a golang.org/x/sys update. I'll update the description.

@lifubang lifubang merged commit a640df5 into opencontainers:release-1.2 Dec 8, 2024
@cyphar cyphar deleted the 1.2-racing-mkdirall branch December 8, 2024 03:51
@lifubang lifubang mentioned this pull request Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.2-pr A backport PR to release-1.2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants