programs: Plug attach_btf_obj_fd leak #748
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
✅ Deploy Preview for aya-rs-docs ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
|
cc @nrxus |
nrxus
reviewed
Aug 11, 2023
aya/src/programs/mod.rs
Outdated
| @@ -604,7 +597,7 @@ fn load_program<T: Link>( | |||
| kernel_version: target_kernel_version, | |||
| expected_attach_type: *expected_attach_type, | |||
| prog_btf_fd: btf_fd.as_ref().map(|f| f.as_fd()), | |||
| attach_btf_obj_fd: *attach_btf_obj_fd, | |||
| attach_btf_obj_fd: attach_btf_obj_fd.as_ref().map(|fd| fd.as_raw_fd() as _), | |||
There was a problem hiding this comment.
why not make attach_btf_obj_fd be a Option<BorrowedFd<'a>>? We already do that for prog_btf_fd,
`ProgramData::attach_btf_obj_fd` is now owned. This means that `ProgramData` now closes the file descriptor on drop. Updates #612.
tamird
force-pushed
the
btf_obj_fd-owned
branch
from
4c6bb46
to
d88ca62
Compare
dave-tucker
approved these changes
Aug 11, 2023
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.
ProgramData::attach_btf_obj_fdis now owned. This means thatProgramDatanow closes the file descriptor on drop.Updates #612.