Skip to content

Fix possible fd leak and closing of dirs in doSafeMakeDir #79534

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.

Sign up for GitHub

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

Jump to bottom
Merged
k8s-ci-robot merged 1 commit into from
Jul 1, 2019
Merged

Fix possible fd leak and closing of dirs in doSafeMakeDir #79534

k8s-ci-robot merged 1 commit into from
Jul 1, 2019
+1 −1

Conversation

@odinuge
Copy link
Member

@odinuge odinuge commented Jun 28, 2019

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
This fixes the issue where "childFD" from syscall.Openat is assigned to
a local variable inside the for loop, instead of the correct one in the
function scope. This results in that when trying to close the "childFD"
in the function scope, it will be equal to "-1", instead of the correct
value.

No huge chance of an fd leak, but better safe than sorry 🤷‍♂

doSafeOpen is very similar, but has correct handling of this.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Fix possible fd leak and closing of dirs in doSafeMakeDir

@odinuge
Fix closing of dirs in doSafeMakeDir
626a0f7 
This fixes the issue where "childFD" from syscall.Openat is assigned to
a local variable inside the for loop, instead of the correct one in the
function scope. This results in that when trying to close the "childFD"
in the function scope, it will be equal to "-1", instead of the correct
value.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 28, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 28, 2019

Hi @odinuge. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 28, 2019
@odinuge
Copy link
Member Author

odinuge commented Jun 28, 2019

/sig storage

/cc @BenTheElder

@k8s-ci-robot k8s-ci-robot requested a review from BenTheElder June 28, 2019 16:32
@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 28, 2019
@k8s-ci-robot k8s-ci-robot requested review from jsafrane and msau42 June 28, 2019 16:32
@msau42
Copy link
Member

msau42 commented Jun 28, 2019

/assign

@BenTheElder
Copy link
Member

BenTheElder commented Jun 28, 2019

Nice catch!
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 28, 2019
@BenTheElder
Copy link
Member

BenTheElder commented Jul 1, 2019

/priority important-longterm

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 1, 2019
@odinuge odinuge mentioned this pull request Jul 1, 2019
Closed
6 tasks
@msau42
Copy link
Member

msau42 commented Jul 1, 2019

/lgtm

Thanks for finding and fixing this!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2019
@odinuge
Copy link
Member Author

odinuge commented Jul 1, 2019

/assign @saad-ali

@msau42
Copy link
Member

msau42 commented Jul 1, 2019

/approve

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jul 1, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, odinuge

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 1, 2019
@odinuge
Copy link
Member Author

odinuge commented Jul 1, 2019

Looks like this was introduced here @msau42: #61044 (and then moved to another file).

Is this so important that you think we should back port it, or is it ok to just get it into master?

@msau42
Copy link
Member

msau42 commented Jul 1, 2019

I think it would be good to backport it

@k8s-ci-robot k8s-ci-robot merged commit a5e3d74 into kubernetes:master Jul 1, 2019
This was referenced Jul 2, 2019
Merged
Merged
Merged
Closed
k8s-ci-robot added a commit that referenced this pull request Jul 3, 2019
@k8s-ci-robot
Merge pull request #79664 from odinuge/automated-cherry-pick-of-#7953…
2d0cf16 
…4-upstream-release-1.14

Automated cherry pick of #79534: Fix closing of dirs in doSafeMakeDir
k8s-ci-robot added a commit that referenced this pull request Jul 3, 2019
@k8s-ci-robot
Merge pull request #79665 from odinuge/automated-cherry-pick-of-#7953…
ff7fb33 
…4-upstream-release-1.13

Automated cherry pick of #79534: Fix closing of dirs in doSafeMakeDir
k8s-ci-robot added a commit that referenced this pull request Jul 4, 2019
@k8s-ci-robot
Merge pull request #79663 from odinuge/automated-cherry-pick-of-#7953…
c0f1f9f 
…4-upstream-release-1.15

Automated cherry pick of #79534: Fix closing of dirs in doSafeMakeDir
This was referenced Sep 19, 2019
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BenTheElder BenTheElder Awaiting requested review from BenTheElder

@jsafrane jsafrane Awaiting requested review from jsafrane

@msau42 msau42 Awaiting requested review from msau42

Assignees

@saad-ali saad-ali

@msau42 msau42

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@odinuge @k8s-ci-robot @msau42 @BenTheElder @saad-ali