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

Jump to bottom

dnsdist: Release memory on DNS over TLS handshake failure #7060

Merged
merged 3 commits into from Oct 15, 2018
Merged

dnsdist: Release memory on DNS over TLS handshake failure #7060

merged 3 commits into from Oct 15, 2018

Conversation

rgacogne
Copy link
Member

Short description

Otherwise we leak the memory allocated to handle the TLS connection if the handshake doesn't succeed correctly.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

@rgacogne rgacogne added this to the dnsdist-1.3.x milestone Oct 12, 2018
@rgacogne
Copy link
Member Author

We should really use smart pointers there, although OpenSSL structures being opaque makes it a bit harder.

@rgacogne rgacogne mentioned this pull request Oct 12, 2018
Merged
7 tasks
zeha
zeha reviewed Oct 12, 2018
View reviewed changes
pdns/dnsdistdist/tcpiohandler.cc Outdated
try {
handleIORequest(res, timeout);
}
catch(const std::exception&) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe this should catch (...) instead, to also get PDNSExceptions?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, thanks!

zeha
zeha approved these changes Oct 12, 2018
View reviewed changes
Copy link
Collaborator

@zeha zeha left a comment

Choose a reason for hiding this comment

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

lgtm

chbruyand
chbruyand approved these changes Oct 15, 2018
View reviewed changes
Copy link
Member

@chbruyand chbruyand left a comment

Choose a reason for hiding this comment

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

LGTM

@rgacogne rgacogne merged commit 5c6ce70 into PowerDNS:master Oct 15, 2018
@rgacogne rgacogne deleted the dnsdist-tls-accept-leak branch October 15, 2018 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zeha zeha zeha approved these changes

@chbruyand chbruyand chbruyand approved these changes

Assignees
No one assigned
Labels
defect dnsdist
Projects
None yet
Milestone
dnsdist-1.3.x
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rgacogne @zeha @chbruyand