fix(gvisor): handle arbitrary sandbox IDs #1612
Merged
Conversation
This file contains 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
4b083d9 to
585bf2c
Compare
|
/milestone 0.14.1 |
Signed-off-by: Luca Guerra <luca@guerra.sh>
Signed-off-by: Luca Guerra <luca@guerra.sh>
585bf2c to
f261c11
Compare
gnosek
reviewed
Jan 11, 2024
Signed-off-by: Luca Guerra <luca@guerra.sh>
Signed-off-by: Luca Guerra <luca@guerra.sh>
10dad91 to
055e412
Compare
|
LGTM label has been added. Git tree hash: 9b354632cae65189231ef3771100df12e9230cb4
|
FedeDP
reviewed
Jan 15, 2024
| @@ -534,8 +553,10 @@ int32_t engine::next(scap_evt **pevent, uint16_t *pdevid, uint32_t *pflags) | |||
| sandbox_entry &sandbox = it->second; | |||
| if(sandbox.m_closing) | |||
| { | |||
| std::string container_id = sandbox.m_container_id; | |||
There was a problem hiding this comment.
Shouldn't this be sandbox.m_id?
I mean, release_sandbox_id takes the sandbox id as argument...
There was a problem hiding this comment.
The names are a little confusing I understand, but the container_id is the string which is the one that release_sandbox_id takes as parameter
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Andreagit97, FedeDP, loresuso, LucaGuerra The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This was referenced Jan 17, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this?
/kind bug
Any specific area of the project related to this PR?
/area libscap-engine-gvisor
Does this PR require a change in the driver versions?
No.
What this PR does / why we need it:
In the gvisor engine we handle the sandbox ID by generating a numeric value to represent it and using it in the pid/tid fields to distinguish between containers. This was initially extracted from the string itself if it was written in hex (like it is normally in containerd, docker, ...) but it is not a reliable way because it does not handle arbitrary strings or collisions.
This PR fixes it by implementing the following:
Which issue(s) this PR fixes:
Fixes #1602
Special notes for your reviewer:
Does this PR introduce a user-facing change?: