andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memory leak in OpenSslEngine

Browse Source 
Motivation:

When a remote peer did open a connection and only do the handshake without sending any data and then directly close the connection we did not call shutdown() in the OpenSslEngine. This leads to a native memory leak. Beside this it also was not fireed when a OpenSslEngine was created but never used.

Modifications:

- Make sure shutdown() is called in all cases when closeInbound() is called
- Call shutdown() also in the finalize() method to ensure we release native memory when the OpenSslEngine is GC'ed

Result:

No more memory leak when using OpenSslEngine
This commit is contained in:
Norman Maurer 2014-12-11 10:36:56 +01:00 committed by Norman Maurer
parent 7bb7b8742f
commit 6e5ab465d9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java
View File

@ -554,15 +554,11 @@ public final class OpenSslEngine extends SSLEngine {
isInboundDone = true; isInboundDone = true;
engineClosed = true; engineClosed = true;
if (accepted != 0) { shutdown();
if (!receivedShutdown) {
shutdown(); if (accepted != 0 && !receivedShutdown) {
throw new SSLException( throw new SSLException(
"Inbound closed before receiving peer's close_notify: possible truncation attack?"); "Inbound closed before receiving peer's close_notify: possible truncation attack?");
}
} else {
// engine closing before initial handshake
shutdown();
} }
} }
@ -746,10 +742,9 @@ public final class OpenSslEngine extends SSLEngine {
@Override @Override
public synchronized void beginHandshake() throws SSLException { public synchronized void beginHandshake() throws SSLException {
if (engineClosed) { if (engineClosed || destroyed != 0) {
throw ENGINE_CLOSED; throw ENGINE_CLOSED;
} }
switch (accepted) { switch (accepted) {
case 0: case 0:
SSL.doHandshake(ssl); SSL.doHandshake(ssl);
@ -772,7 +767,7 @@ public final class OpenSslEngine extends SSLEngine {
} }
private synchronized void beginHandshakeImplicitly() throws SSLException { private synchronized void beginHandshakeImplicitly() throws SSLException {
if (engineClosed) { if (engineClosed || destroyed != 0) {
throw ENGINE_CLOSED; throw ENGINE_CLOSED;
} }
@ -882,4 +877,11 @@ public final class OpenSslEngine extends SSLEngine {
public boolean getEnableSessionCreation() { public boolean getEnableSessionCreation() {
return false; return false;
} }
@Override
protected void finalize() throws Throwable {
super.finalize();
// Call shutdown as the user may have created the OpenSslEngine and not used it at all.
shutdown();
}
} }