Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: bump mountinfo to v0.4.0 #2657

Merged
merged 2 commits into from
Oct 22, 2020

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Oct 21, 2020

Release notes:

In particular, this fixes a regression introduced in commit b8bf572 (PR #2647)
which checked the mountinfo.Root field in a FilterFunc, while Root was
not (yet) set when calling the filter.

Also add "runc run --no-pivot must not expose bare /proc" test by @AkihiroSuda
to prevent future regressions like this one.

Closes: #2655

@kolyshkin kolyshkin force-pushed the bump-mountinfo-0.4.0 branch from f2e7faa to 703b7b4 Compare October 21, 2020 17:18
@cyphar
Copy link
Member

cyphar commented Oct 22, 2020

We can probably close #2655 in favour of this if you cherry-pick 3a45259. Or you can LGTM that and merge it, and we can re-add the info.Root != "/" check here.

@kolyshkin
Copy link
Contributor Author

if you cherry-pick 3a45259

done

@kolyshkin kolyshkin force-pushed the bump-mountinfo-0.4.0 branch from 2da404e to 918b7b8 Compare October 22, 2020 04:38
@kolyshkin
Copy link
Contributor Author

Took a liberty to make a minor change in the test case:

-       [[ ${lines[*]} == *"mount: permission denied"* ]]
+       [[ "$output" == *"mount: permission denied"* ]]

@kolyshkin
Copy link
Contributor Author

@AkihiroSuda @mrunalp @cyphar PTAL

kolyshkin and others added 2 commits October 21, 2020 21:41
Release notes:
 - https://github.com/moby/sys/releases/tag/mountinfo%2Fv0.4.0

In particular, this fixes a regression introduced in commit b8bf572
which checked the mountinfo.Root field in a FilterFunc, while Root was
not set when calling a filter.

Signed-off-by: Kir Kolyshkin <[email protected]>
For preventing regression like opencontainers#2647

Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Aleksa Sarai <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin force-pushed the bump-mountinfo-0.4.0 branch from 918b7b8 to f5c345c Compare October 22, 2020 04:43
Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

LGTM.

@cyphar cyphar closed this in 4633f7b Oct 22, 2020
@cyphar cyphar merged commit 4633f7b into opencontainers:master Oct 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants