Fix potential NULL pointer dereference #1067
Merged
Conversation
This file contains 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
torben-hansen
approved these changes
Jun 22, 2023
nebeid
reviewed
Jun 22, 2023
| @@ -185,6 +185,9 @@ int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, | |||
| for (; lastpos < n; lastpos++) { | |||
| const X509_ATTRIBUTE *attr = | |||
| sk_X509_ATTRIBUTE_value(req->req_info->attributes, lastpos); | |||
| if (attr == NULL) { | |||
There was a problem hiding this comment.
I'm not sure if this can happen, since n was set the number of attributes, if I understood correctly. There is a similar code here
Lines 153 to 155 in 8402a6e
There was a problem hiding this comment.
yeah, I had the same thought but I'm not 100% certain it can't happen. The additional check is very cheap anyway, so no harm in having it.
| @@ -178,6 +178,10 @@ static int do_name_ex(BIO *out, const X509_NAME *n, int indent, | |||
| } else { | |||
There was a problem hiding this comment.
From the documentation of OBJ_obj2nid() called on l. 174,
Lines 110 to 113 in cfce39d
the
else branch should be for a known nid. If we prefer to be safe still, maybe the check for NULL would be inside the else branch.
There was a problem hiding this comment.
I think it's safer to have the NULL check right before calling strlen unconditionally?
nebeid
approved these changes
Jun 22, 2023
Merged
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.
Issues:
Resolves V935691760
Description of changes:
Fix potential NULL pointer dereference in two places.
Call-outs:
Point out areas that need special attention or support during the review process. Discuss architecture or design changes.
Testing:
How is this change tested (unit tests, fuzz tests, etc.)? Are there any testing steps to be verified by the reviewer?
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.