From 16a13c7bfc3447531ad790b478b9bcdb62c85ca3 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Mon, 23 Mar 2015 20:07:03 -0700 Subject: [PATCH 1/5] tls_wrap: fix BIO leak on SSL error Fix: https://github.com/iojs/io.js/issues/1075 --- src/tls_wrap.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 13ba550398bc06..0a6be858038866 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -375,6 +375,7 @@ Local TLSWrap::GetSSLError(int status, int* err, const char** msg) { *msg = buf; } static_cast(BIO_reset(bio)); + BIO_free_all(bio); return scope.Escape(exception); } From 3327932bb6cf3fe6d1619df07b4a20ad257f4a61 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Tue, 24 Mar 2015 20:21:32 -0700 Subject: [PATCH 2/5] tls_wrap: fix this incredibly stupid leak Always call `Done` on the WriteWrap, and ensure that `EncOut` will consume all data in clear_in_ and invoke queued callbacks. Fix: https://github.com/iojs/io.js/issues/1075 --- src/tls_wrap.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 0a6be858038866..9b3459f8599d41 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -90,8 +90,10 @@ TLSWrap::~TLSWrap() { MakePending(); // And destroy - while (WriteItem* wi = pending_write_items_.PopFront()) + while (WriteItem* wi = pending_write_items_.PopFront()) { + wi->w_->Done(UV_ECANCELED); delete wi; + } ClearError(); } @@ -310,10 +312,12 @@ void TLSWrap::EncOut() { write_req->Dispatched(); // Ignore errors, this should be already handled in js - if (err) + if (err) { write_req->Dispose(); - else + InvokeQueued(err); + } else { NODE_COUNT_NET_BYTES_SENT(write_size_); + } } @@ -335,6 +339,9 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) { // Commit NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_); + // Ensure that the progress will be maed and `InvokeQueued` will be called + wrap->ClearIn(); + // Try writing more data wrap->write_size_ = 0; wrap->EncOut(); From be2d2120d784eb527e0d57a181f3f936970f3475 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Wed, 25 Mar 2015 15:09:36 -0500 Subject: [PATCH 3/5] fixup --- src/tls_wrap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 9b3459f8599d41..a99b31f7d4f0b2 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -339,7 +339,7 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) { // Commit NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_); - // Ensure that the progress will be maed and `InvokeQueued` will be called + // Ensure that the progress will be made and `InvokeQueued` will be called wrap->ClearIn(); // Try writing more data From 301cf948b739dcb0a36ab141482dea1b0aeb1d73 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Wed, 25 Mar 2015 15:09:43 -0500 Subject: [PATCH 4/5] fixup --- src/tls_wrap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index a99b31f7d4f0b2..9d0a5272c8ce85 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -339,7 +339,7 @@ void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) { // Commit NodeBIO::FromBIO(wrap->enc_out_)->Read(nullptr, wrap->write_size_); - // Ensure that the progress will be made and `InvokeQueued` will be called + // Ensure that the progress will be made and `InvokeQueued` will be called. wrap->ClearIn(); // Try writing more data From ec2a2bad85e97b255ac0d29e5a6065bc62f9851a Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Wed, 25 Mar 2015 15:11:12 -0500 Subject: [PATCH 5/5] invoke queued --- src/tls_wrap.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc index 9d0a5272c8ce85..bc6d50b2d0e02c 100644 --- a/src/tls_wrap.cc +++ b/src/tls_wrap.cc @@ -90,10 +90,7 @@ TLSWrap::~TLSWrap() { MakePending(); // And destroy - while (WriteItem* wi = pending_write_items_.PopFront()) { - wi->w_->Done(UV_ECANCELED); - delete wi; - } + InvokeQueued(UV_ECANCELED); ClearError(); }