Add a null check to OCSP stapling - #12951
Merged
Merged
Conversation
Code analyzation found that the returned value is not checked before the memcpy.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds a null pointer check for the return value of OPENSSL_malloc() in the ssl_callback_ocsp_stapling function in OCSPStapling.cc. Previously, if OPENSSL_malloc failed (returned nullptr), the code would proceed to call memcpy with a null destination pointer, causing undefined behavior (likely a crash). The fix correctly releases the mutex and returns SSL_TLSEXT_ERR_NOACK when allocation fails.
Changes:
- Added a null check for the
OPENSSL_mallocreturn value before thememcpycall. - On allocation failure, the stapling mutex is released and the function returns
SSL_TLSEXT_ERR_NOACK(graceful degradation — the handshake continues without OCSP stapling).
bneradt
approved these changes
Mar 10, 2026
Contributor
|
[approve ci autest 0] |
Contributor
|
Cherry-picked to 10.2.x |
cmcfarlen
pushed a commit
that referenced
this pull request
Mar 18, 2026
* Add a null check to OCSP stapling Code analyzation found that the returned value is not checked before the memcpy. * Add debug log * Change the debug log to an error log (cherry picked from commit 3771467)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Code analysis found that the returned value is not checked before the memcpy.