Futher peer review feedback

Author: dgarske

CMakeLists.txt

@@ -554,6 +554,7 @@ if(WOLFTPM_FWTPM)
             ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_CURRENT_BINARY_DIR}
         )
+        target_compile_options(fwtpm_fuzz PRIVATE "-fsanitize=fuzzer-no-link")
         target_link_options(fwtpm_fuzz PRIVATE "-fsanitize=fuzzer")
     endif()
 

src/fwtpm/fwtpm.c

@@ -38,6 +38,7 @@
 int FWTPM_Init(FWTPM_CTX* ctx)
 {
     int rc;
+    int rngInit = 0;
     FWTPM_NV_HAL savedNvHal;
     struct FWTPM_CLOCK_HAL_S savedClockHal;
 #ifdef WOLFTPM_FWTPM_TIS
@@ -84,6 +85,9 @@ int FWTPM_Init(FWTPM_CTX* ctx)
     rc = wolfCrypt_Init();
     if (rc == 0) {
         rc = wc_InitRng(&ctx->rng);
+        if (rc == 0) {
+            rngInit = 1;
+        }
     }
 
     /* Generate per-boot context protection key (volatile only) for
@@ -120,7 +124,9 @@ int FWTPM_Init(FWTPM_CTX* ctx)
 #endif
 
     if (rc != 0) {
-        wc_FreeRng(&ctx->rng);
+        if (rngInit) {
+            wc_FreeRng(&ctx->rng);
+        }
         wolfCrypt_Cleanup();
     }