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.

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

Fix resource leak on error in GetDevURandom #10837

Merged
merged 1 commit into from Jul 17, 2017
Merged

Fix resource leak on error in GetDevURandom #10837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/random.cpp
View file
Open in desktop
Expand Up @@ -191,6 +191,7 @@ void GetDevURandom(unsigned char *ent32)
do {
ssize_t n = read(f, ent32 + have, NUM_OS_RANDOM_BYTES - have);
if (n <= 0 || n + have > NUM_OS_RANDOM_BYTES) {
close(f);
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it needed at all as RandFailure() aborts?

Copy link
Contributor Author

@bytting bytting Jul 15, 2017 •
edited

Choose a reason for hiding this comment

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

As I understand it, most OS's will close descriptors on exit, but it is not guaranteed by the C language, so best practice is to close properly.

Also, depending on the behavior of RandFailure, which could change in the future, seems sloppy

Copy link
Contributor

Choose a reason for hiding this comment

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

Heh, if we abort() there's gonna be a lot of things left open, but OK.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm so used to try to bring everything down brick by brick, I can't remember ever resorting to abort, or even exit 😟

RandFailure();
}
have += n;
Expand Down