diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index 605d78c578..89ab181be6 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -495,6 +495,14 @@ exit:
 #endif
     }
 
+    mbedtls_x509write_csr_free(&req);
+    mbedtls_pk_free(&key);
+    mbedtls_ctr_drbg_free(&ctr_drbg);
+    mbedtls_entropy_free(&entropy);
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+    mbedtls_psa_crypto_free();
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
+
     cur = opt.san_list;
     while (cur != NULL) {
         mbedtls_x509_san_list *next = cur->next;
@@ -512,22 +520,6 @@ exit:
         cur = next;
     }
 
-    mbedtls_x509write_csr_free(&req);
-    mbedtls_pk_free(&key);
-    mbedtls_ctr_drbg_free(&ctr_drbg);
-    mbedtls_entropy_free(&entropy);
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
-    mbedtls_psa_crypto_free();
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
-
-    cur = opt.san_list;
-    while (cur != NULL) {
-        prev = cur;
-        cur = cur->next;
-        mbedtls_free(prev);
-    }
-
-
     mbedtls_exit(exit_code);
 }
 #endif /* MBEDTLS_X509_CSR_WRITE_C && MBEDTLS_PK_PARSE_C && MBEDTLS_FS_IO &&