FFI: fix missing CAMLparamX and CAMLreturn in the C FFI
#90
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
gasche
reviewed
Aug 12, 2022
There was a problem hiding this comment.
In some of those places, the function were actually safe if you reason at the tricky level of value invalidation by allocations. But I would agree that following the "simple" protocol all the time is more reasonable -- especially when contributors get in charge of debugging a FFI failure as @anmonteiro was. I don't expect any performance issue with this approach either.
I wrote an inline comment about a missing CAMLreturn in one function.
| @@ -831,7 +837,7 @@ CAMLprim value caml_alpn_select_cb(SSL *ssl, | |||
| *out = String_val(selected_protocol); | |||
| *outlen = len; | |||
|
|
|||
| return SSL_TLSEXT_ERR_OK; | |||
| CAMLreturn(SSL_TLSEXT_ERR_OK); | |||
There was a problem hiding this comment.
I believe this one is necessary for safety after the CAMLlocal above. You should also fix the return on line 826->832 I believe?
|
@gasche thanks for the review! |
anmonteiro
added a commit
to anmonteiro/opam-repository
that referenced
this pull request
Aug 12, 2022
CHANGES: - Add a few verification functions (savonet/ocaml-ssl#71): - `add_extra_chain_cert` to send additional chain certificates to the peer. - `add_cert_to_store`: to allow verification of the peer certificate CA. - `set_ip`: sets the expected IP address to be verified on a SSL socket. - Improve `use_certificate_from_string` (savonet/ocaml-ssl#71) to read any type of key (rather than just RSA). - Fix a segmentation fault in the ALPN selection callback under OCaml 5 (savonet/ocaml-ssl#89). - Audit the C FFI and add `CAMLparamX` and `CAMLreturn` calls (savonet/ocaml-ssl#90).
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.
cc @gasche @gadmm
I audited the C FFI in the repo and added a few missing
CAMLparamandCAMLreturncalls.Not meant to put work on your plate! Don't feel obliged to review.