Skip to content

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

Merged
rgacogne merged 3 commits intoPowerDNS:masterfrom
rgacogne:dnsdist-tls-accept-leak
Oct 15, 2018
Merged

dnsdist: Release memory on DNS over TLS handshake failure#7060
rgacogne merged 3 commits intoPowerDNS:masterfrom
rgacogne:dnsdist-tls-accept-leak

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
Copy link
Member Author

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

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!

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

Copy link
Contributor

@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants