[Openvpn-devel,v1] crypto: assert opt before first use in openvpn_decrypt_aead()

Message ID 20261102141556.29908-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] crypto: assert opt before first use in openvpn_decrypt_aead() |

Commit Message

Gert Doering Nov. 2, 2026, 2:15 p.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

opt was dereferenced before ASSERT(opt). Move the assertion up.

Change-Id: Id6587b3d44d3326cae83c460cd85e8570ee8666a
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Steffan Karger <steffan@karger.me>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2089
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2089
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Steffan Karger <steffan@karger.me>
  

Patch

diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
index 3d3ab0c..498c327 100644
--- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c
@@ -440,6 +440,7 @@ 
     struct gc_arena gc;
     gc_init(&gc);
 
+    ASSERT(opt);
     struct key_ctx *ctx = &opt->key_ctx_bi.decrypt;
     const bool use_epoch_data_format = opt->flags & CO_EPOCH_DATA_KEY_FORMAT;
     if (!use_epoch_data_format && cipher_decrypt_verify_fail_exceeded(ctx))
@@ -450,7 +451,6 @@ 
     const int tag_size = OPENVPN_AEAD_TAG_LENGTH;
 
 
-    ASSERT(opt);
     ASSERT(frame);
     ASSERT(buf->len > 0);
     ASSERT(ctx->cipher);