Skip to content

[27.1 backport] vendor: github.com/gofrs/flock v0.12.1#48235

Merged
AkihiroSuda merged 2 commits intomoby:27.0from
thaJeztah:27.1_backport_vendor_flock
Jul 25, 2024
Merged

[27.1 backport] vendor: github.com/gofrs/flock v0.12.1#48235
AkihiroSuda merged 2 commits intomoby:27.0from
thaJeztah:27.1_backport_vendor_flock

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

vendor: golang.org/x/sys v0.22.0

full diff: golang/sys@v0.21.0...v0.22.0

vendor: github.com/gofrs/flock v0.12.1

  • fix: missing read-write flag in reopenFDOnError
    fixes a regression that could result in a ERROR: bad file descriptor.

gofrs/flock@b659e1e
introduced a regression where f.flag would not be in read-write mode
1 but read-only 2 which breaks people using NFS protocol.

full diff: gofrs/flock@v0.12.0...v0.12.1

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

full diff: golang/sys@v0.21.0...v0.22.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 077b32a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
- fix: missing read-write flag in reopenFDOnError
  fixes a regression that could result in a `ERROR: bad file descriptor`.

gofrs/flock@b659e1e
introduced a regression where `f.flag` would not be in read-write mode
[1]  but read-only [2] which breaks people using NFS protocol.

[1]: gofrs/flock@b659e1e#diff-87c2c4fe0fb43f4b38b4bee45c1b54cfb694c61e311f93b369caa44f6c1323ffR192
[2]: gofrs/flock@b659e1e#diff-22145325dded38eb5288ed3321a113d8260ccc70747ee04d4551bfd2fba975fdR69

full diff: gofrs/flock@v0.12.0...v0.12.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 1e2ccf8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 27.1.2 milestone Jul 24, 2024
@thaJeztah thaJeztah self-assigned this Jul 24, 2024
@AkihiroSuda AkihiroSuda merged commit 7d861e8 into moby:27.0 Jul 25, 2024
@thaJeztah thaJeztah deleted the 27.1_backport_vendor_flock branch July 25, 2024 10:25
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