Skip to content

Commit

Permalink
tls: fix session and keylog add listener segfault
Browse files Browse the repository at this point in the history
Fix an issue where adding a session or keylog listener on a tlsSocket
after it was destroyed caused a segfault.

fixes: #38133
fixes: #38135
  • Loading branch information
Linkgoron committed Apr 9, 2021
1 parent d2f116c commit 80f37a5
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/_tls_wrap.js
Expand Up @@ -689,7 +689,9 @@ TLSSocket.prototype._init = function(socket, wrap) {
if (event !== 'keylog')
return;

ssl.enableKeylogCallback();
// Guard against enableKeylogCallback after destroy
if (!this._handle) return;
this._handle.enableKeylogCallback();

// Remove this listener since it's no longer needed.
this.removeListener('newListener', keylogNewListener);
Expand Down Expand Up @@ -733,7 +735,9 @@ TLSSocket.prototype._init = function(socket, wrap) {
if (event !== 'session')
return;

ssl.enableSessionCallbacks();
// Guard against enableSessionCallbacks after destroy
if (!this._handle) return;
this._handle.enableSessionCallbacks();

// Remove this listener since it's no longer needed.
this.removeListener('newListener', newListener);
Expand Down
19 changes: 19 additions & 0 deletions test/parallel/test-tls-tlswrap-segfault-2.js
@@ -0,0 +1,19 @@
// This test ensures that Node.js doesn't incur a segfault while
// adding session or keylog listeners.
// https://github.com/nodejs/node/issues/38133
// https://github.com/nodejs/node/issues/38135

const tls = require('tls');
const tlsSocketKeyLog = tls.connect('cause-error');
tlsSocketKeyLog.on('error', (e) => {
setTimeout(()=> {
tlsSocketKeyLog.on('keylog',()=>{});
}, 10);
});

const tlsSocketSession = tls.connect('cause-error-2');
tlsSocketSession.on('error', (e) => {
setTimeout(()=> {
tlsSocketSession.on('keylog',()=>{});
}, 10);
});

0 comments on commit 80f37a5

Please sign in to comment.