Skip to content

tls: fix segfault on destroy after partial read - #11898

Merged
bnoordhuis merged 1 commit into
nodejs:masterfrom
bnoordhuis:fix11885
Mar 20, 2017
Merged

tls: fix segfault on destroy after partial read#11898
bnoordhuis merged 1 commit into
nodejs:masterfrom
bnoordhuis:fix11885

Conversation

@bnoordhuis

@bnoordhuisbnoordhuis commented Mar 17, 2017

Copy link
Copy Markdown
Member

Refs: #11885

@nodejs-github-botnodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. tls Issues and PRs related to the tls subsystem. labels Mar 17, 2017
@bnoordhuisbnoordhuis mentioned this pull request Mar 17, 2017
Closed
cjihrig
cjihrig approved these changes Mar 17, 2017
View reviewed changes

@cjihrigcjihrig left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Confirmed that the test segfaults without this patch.

@Fishrock123

Fishrock123 commented Mar 17, 2017

Copy link
Copy Markdown
Contributor

CI: https://ci.nodejs.org/job/node-test-pull-request/6905/

@bnoordhuis

bnoordhuis commented Mar 17, 2017

Copy link
Copy Markdown
MemberAuthor

Curious, I started https://ci.nodejs.org/job/node-test-pull-request/6898/ but it didn't show up?

@bnoordhuis
tls: fix segfault on destroy after partial read
03a6c6e
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: nodejs#11885
PR-URL: nodejs#11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@bnoordhuis
bnoordhuis deleted the fix11885 branch March 20, 2017 15:53
@bnoordhuis
bnoordhuis merged commit 03a6c6e into nodejs:masterMar 20, 2017
@jcstanaway

jcstanaway commented Mar 20, 2017

Copy link
Copy Markdown

Will this get merged into the 6.x release? If so, when would this be expected to happen?

@addaleax

addaleax commented Mar 20, 2017

Copy link
Copy Markdown
Member

@ccs018 The general rule is that a patch has to live for 2 weeks in a Current (v7.x) release before it gets backported to the LTS branches.

@jcstanaway

jcstanaway commented Mar 20, 2017

Copy link
Copy Markdown

Thanks. Just trying to determine if we need to build a private patched version or wait for an official release.

@bnoordhuis

bnoordhuis commented Mar 20, 2017

Copy link
Copy Markdown
MemberAuthor

Lead time between 'fix merged' and 'available in a LTS release' is on the order of a month, assuming no regressions.

jungx098 pushed a commit to jungx098/node that referenced this pull request Mar 21, 2017
@bnoordhuis@jungx098
tls: fix segfault on destroy after partial read
77627bd
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: nodejs#11885
PR-URL: nodejs#11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@italoacasas

italoacasas commented Mar 21, 2017

Copy link
Copy Markdown

This PR need backport to v7

@bnoordhuis

bnoordhuis commented Mar 21, 2017

Copy link
Copy Markdown
MemberAuthor

@italoacasas How are you trying to merge this into v7? It should apply cleanly, there have been no other changes.

@italoacasas

italoacasas commented Mar 21, 2017•
edited
Loading

Copy link
Copy Markdown

@bnoordhuis yeah don't worry, I'm sick and I was not thinking clearly.

italoacasas pushed a commit to italoacasas/node that referenced this pull request Mar 21, 2017
@bnoordhuisItalo A. Casas
tls: fix segfault on destroy after partial read
c626734
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: nodejs#11885
PR-URL: nodejs#11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@italoacasasitaloacasas mentioned this pull request Mar 21, 2017
Merged
cjihrig added a commit that referenced this pull request Mar 21, 2017
@cjihrig
2017-03-21, Version 7.7.4 (Current)
44b4c0b
Notable changes:
* deps: Add node-inspect 1.10.6 (Jan Krems) #11869
* inspector: proper WS URLs when bound to 0.0.0.0 (Eugene Ostroukhov) #11850
* tls: fix segfault on destroy after partial read. (Ben Noordhuis) #11898
PR-URL: #11941
cjihrig added a commit that referenced this pull request Mar 21, 2017
@cjihrig
2017-03-21, Version 7.7.4 (Current)
7e6e7d3
Notable changes:
* deps: Add node-inspect 1.10.6 (Jan Krems) #11869
* inspector: proper WS URLs when bound to 0.0.0.0 (Eugene Ostroukhov) #11850
* tls: fix segfault on destroy after partial read. (Ben Noordhuis) #11898
PR-URL: #11941
MylesBorins pushed a commit that referenced this pull request Apr 18, 2017
@bnoordhuis@MylesBorins
tls: fix segfault on destroy after partial read
31dc04e
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: #11885
PR-URL: #11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request Apr 18, 2017
@bnoordhuis@MylesBorins
tls: fix segfault on destroy after partial read
cd698e0
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: #11885
PR-URL: #11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request Apr 19, 2017
@bnoordhuis@MylesBorins
tls: fix segfault on destroy after partial read
54f5258
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: #11885
PR-URL: #11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins pushed a commit that referenced this pull request Apr 19, 2017
@bnoordhuis@MylesBorins
tls: fix segfault on destroy after partial read
d0868ff
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: #11885
PR-URL: #11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This was referenced Apr 19, 2017
Merged
Merged
imyller added a commit to imyller/meta-nodejs that referenced this pull request Apr 20, 2017
@imyller
2017-03-21, Version 7.7.4 (Current)
dabd3a5
 Notable changes:
* deps: Add node-inspect 1.10.6 (Jan Krems) nodejs/node#11869
* inspector: proper WS URLs when bound to 0.0.0.0 (Eugene Ostroukhov) nodejs/node#11850
* tls: fix segfault on destroy after partial read. (Ben Noordhuis) nodejs/node#11898
PR-URL: nodejs/node#11941
Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
MylesBorins added a commit that referenced this pull request May 2, 2017
@MylesBorins
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
788f280
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) #9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) #11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) #11947
* (Ben Noordhuis) #11898
* (jBarz) #11776
PR-URL: #12499
MylesBorins added a commit that referenced this pull request May 2, 2017
@MylesBorins
2017-05-02, Version 6.10.3 'Boron' (LTS)
a0bfd4f
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) #9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) #11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) #11947
* (Ben Noordhuis) #11898
* (jBarz) #11776
PR-URL: #12497
MylesBorins added a commit that referenced this pull request May 2, 2017
@MylesBorins
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
9802d46
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) #9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) #11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) #11947
* (Ben Noordhuis) #11898
* (jBarz) #11776
PR-URL: #12499
MylesBorins added a commit that referenced this pull request May 2, 2017
@MylesBorins
2017-05-02, Version 6.10.3 'Boron' (LTS)
20e27dd
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) #9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) #11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) #11947
* (Ben Noordhuis) #11898
* (jBarz) #11776
PR-URL: #12497
imyller added a commit to imyller/meta-nodejs that referenced this pull request May 2, 2017
@imyller
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
9c2a002
 Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs/node#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs/node#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs/node#11947
* (Ben Noordhuis) nodejs/node#11898
* (jBarz) nodejs/node#11776
PR-URL: nodejs/node#12499
Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
imyller added a commit to imyller/meta-nodejs that referenced this pull request May 2, 2017
@imyller
2017-05-02, Version 6.10.3 'Boron' (LTS)
6c7c224
 Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs/node#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs/node#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs/node#11947
* (Ben Noordhuis) nodejs/node#11898
* (jBarz) nodejs/node#11776
PR-URL: nodejs/node#12497
Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
imyller added a commit to imyller/meta-nodejs that referenced this pull request May 2, 2017
@imyller
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
27a8c43
 Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs/node#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs/node#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs/node#11947
* (Ben Noordhuis) nodejs/node#11898
* (jBarz) nodejs/node#11776
PR-URL: nodejs/node#12499
Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
imyller added a commit to imyller/meta-nodejs that referenced this pull request May 2, 2017
@imyller
2017-05-02, Version 6.10.3 'Boron' (LTS)
3d61075
 Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs/node#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs/node#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs/node#11947
* (Ben Noordhuis) nodejs/node#11898
* (jBarz) nodejs/node#11776
PR-URL: nodejs/node#12497
Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017
@MylesBorinsOlivier Martin
2017-05-02, Version 4.8.3 'Argon' (Maintenance)
38a7454
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs#11947
* (Ben Noordhuis) nodejs#11898
* (jBarz) nodejs#11776
PR-URL: nodejs#12499
anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017
@MylesBorinsOlivier Martin
2017-05-02, Version 6.10.3 'Boron' (LTS)
f25ca7a
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs#11947
* (Ben Noordhuis) nodejs#11898
* (jBarz) nodejs#11776
PR-URL: nodejs#12497
andrew749 pushed a commit to michielbaird/node that referenced this pull request Jul 19, 2017
@bnoordhuis@andrew749
tls: fix segfault on destroy after partial read
72a5b0d
OnRead() calls into JS land which can result in the SSL context object
being destroyed on return. Check that `ssl_ != nullptr` afterwards.
Fixes: nodejs/node#11885
PR-URL: nodejs/node#11898
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
andrew749 pushed a commit to michielbaird/node that referenced this pull request Jul 19, 2017
@MylesBorins@andrew749
2017-05-02, Version 6.10.3 'Boron' (LTS)
94b893c
Notable Changes:
* module:
- The module loading global fallback to the Node executable's
directory now works correctly on Windows.
(Richard Lau) nodejs/node#9283
* src:
- fix base64 decoding in rare edgecase
(Nikolai Vavilov) nodejs/node#11995
* tls:
- fix rare segmentation faults when using TLS
* (Trevor Norris) nodejs/node#11947
* (Ben Noordhuis) nodejs/node#11898
* (jBarz) nodejs/node#11776
PR-URL: nodejs/node#12497
@sam-githubsam-github mentioned this pull request Aug 3, 2017
Merged
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnelljasnelljasnell approved these changes
@cjihrigcjihrigcjihrig approved these changes

Assignees

No one assigned

Labels

c++Issues and PRs that require attention from people who are familiar with C++.tlsIssues and PRs related to the tls subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@bnoordhuis@Fishrock123@jcstanaway@addaleax@italoacasas@jasnell@cjihrig@MylesBorins@nodejs-github-bot