mirror of
https://github.com/nodejs/node.git
synced 2026-10-14 10:26:26 -04:00
tls: fix segfault on destroy after partial read
OnRead() calls into JS land which can result in the SSL context object being destroyed on return. Check that `ssl_ != nullptr` afterwards. Fixes: https://github.com/nodejs/node/issues/11885 PR-URL: https://github.com/nodejs/node/pull/11898 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
1 parent
7ef2d90e1b
commit
03a6c6ea8c
2 files changed
+42
No files matched your search
@@ -446,6 +446,12 @@ void TLSWrap::ClearOut() {
|
||||
memcpy(buf.base, current, avail);
|
||||
OnRead(avail, &buf);
|
||||
|
||||
// Caveat emptor: OnRead() calls into JS land which can result in
|
||||
// the SSL context object being destroyed. We have to carefully
|
||||
// check that ssl_ != nullptr afterwards.
|
||||
if (ssl_ == nullptr)
|
||||
return;
|
||||
|
||||
read -= avail;
|
||||
current += avail;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
'use strict';
|
||||
|
||||
const common = require('../common');
|
||||
|
||||
if (!common.hasCrypto) {
|
||||
common.skip('missing crypto');
|
||||
return;
|
||||
}
|
||||
|
||||
const fs = require('fs');
|
||||
const net = require('net');
|
||||
const tls = require('tls');
|
||||
|
||||
const key = fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem');
|
||||
const cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem');
|
||||
const secureContext = tls.createSecureContext({ key, cert });
|
||||
|
||||
const server = net.createServer(common.mustCall((conn) => {
|
||||
const options = { isServer: true, secureContext, server };
|
||||
const socket = new tls.TLSSocket(conn, options);
|
||||
socket.once('data', common.mustCall(() => {
|
||||
socket._destroySSL(); // Should not crash.
|
||||
server.close();
|
||||
}));
|
||||
}));
|
||||
|
||||
server.listen(0, function() {
|
||||
const options = {
|
||||
port: this.address().port,
|
||||
rejectUnauthorized: false,
|
||||
};
|
||||
tls.connect(options, function() {
|
||||
this.write('*'.repeat(1 << 20)); // Write more data than fits in a frame.
|
||||
this.on('error', this.destroy); // Server closes connection on us.
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user