F-13530 - Guard the encrypted salt zeroization against a NULL buffer

2026-09-10 11:35:17 -07:00 · 2026-09-10 11:35:17 -07:00 · d679f5bec5
parent 022fe8409d
commit d679f5bec5
1 changed files with 6 additions and 0 deletions
--- a/src/fwtpm/fwtpm_command.c
+++ b/src/fwtpm/fwtpm_command.c
@ -10596,7 +10596,13 @@ static TPM_RC FwCmd_StartAuthSession(FWTPM_CTX* ctx, TPM2_Packet* cmd,
        FwFreeSession(sess);
    }
    TPM2_ForceZero(salt, sizeof(salt));
+#ifdef WOLFTPM_SMALL_STACK
+    if (encSalt != NULL) {
+        TPM2_ForceZero(encSalt, FWTPM_MAX_PUB_BUF);
+    }
+#else
    TPM2_ForceZero(encSalt, FWTPM_MAX_PUB_BUF);
+#endif
    FWTPM_FREE_BUF(encSalt);
    return rc;
 }