Skip to content

Coverity fixes for new fwtpm code #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aidangarske merged 1 commit into from
Apr 17, 2026
Merged

Coverity fixes for new fwtpm code #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/fwtpm-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,28 @@ jobs:
WOLFSSL_PATH: ./wolfssl
run: make check

- name: Print test-suite.log on failure
if: ${{ failure() && !matrix.build_only }}
run: |
if [ -f test-suite.log ]; then
echo "=== test-suite.log ==="
cat test-suite.log
fi
for f in tests/*.log; do
[ -f "$f" ] || continue
echo "=== $f ==="
cat "$f"
done

- name: Upload failure logs
if: ${{ failure() && !matrix.build_only }}
uses: actions/upload-artifact@v4
with:
name: fwtpm-logs-${{ matrix.name }}
path: |
/tmp/fwtpm_check_*.log
test-suite.log
tests/*.log
retention-days: 5

# ----------------------------------------------------------------
Expand Down
9 changes: 8 additions & 1 deletion examples/pcr/policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ int TPM2_PCR_Policy_Test(void* userCtx, int argc, char *argv[])
TPM_ALG_ID paramEncAlg = TPM_ALG_NULL;
WOLFTPM2_SESSION tpmSession;
int i;
int hexRet;
byte digest[32];
word32 digestLen = 0;
union {
Expand Down Expand Up @@ -108,7 +109,13 @@ int TPM2_PCR_Policy_Test(void* userCtx, int argc, char *argv[])
usage();
return 0;
}
digestLen = hexToByte(digestStr, digest, digestLen / 2);
hexRet = hexToByte(digestStr, digest, digestLen / 2);
if (hexRet < 0) {
printf("Invalid hex digest string\n");
usage();
return 0;
}
Comment thread
dgarske marked this conversation as resolved.
digestLen = (word32)hexRet;
}
else if (argv[argc-1][0] != '-') {
/* TODO: Allow selection of multiple PCR's SHA-1 or SHA2-256 */
Expand Down
83 changes: 54 additions & 29 deletions src/fwtpm/fwtpm_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3587,7 +3587,7 @@ static TPM_RC FwCmd_Create(FWTPM_CTX* ctx, TPM2_Packet* cmd,

if (rc == 0 && sensDataSize > 0) {
/* Use caller-supplied key material */
if (sensDataSize > (UINT16)FWTPM_MAX_PRIVKEY_DER) {
if (sensDataSize > (UINT16)FWTPM_MAX_DATA_BUF) {
rc = TPM_RC_SIZE;
}
if (rc == 0) {
Expand Down Expand Up @@ -4090,7 +4090,7 @@ static TPM_RC FwCmd_LoadExternal(FWTPM_CTX* ctx, TPM2_Packet* cmd,
if (rc == 0 && inPrivSize > 0 && sensitiveType == TPM_ALG_SYMCIPHER &&
qSz > 0) {
/* For SYMCIPHER, qBuf contains the raw AES key bytes */
if (qSz > (UINT16)FWTPM_MAX_PRIVKEY_DER) {
if (qSz > (UINT16)FWTPM_MAX_DER_SIG_BUF) {
Comment thread
dgarske marked this conversation as resolved.
rc = TPM_RC_SIZE;
}
if (rc == 0) {
Expand Down Expand Up @@ -5459,7 +5459,7 @@ static TPM_RC FwCmd_CreateLoaded(FWTPM_CTX* ctx, TPM2_Packet* cmd,
}

if (rc == 0 && sensDataSize > 0) {
if (sensDataSize > (UINT16)FWTPM_MAX_PRIVKEY_DER) {
if (sensDataSize > (UINT16)FWTPM_MAX_DATA_BUF) {
rc = TPM_RC_SIZE;
}
if (rc == 0) {
Expand Down Expand Up @@ -5496,7 +5496,7 @@ static TPM_RC FwCmd_CreateLoaded(FWTPM_CTX* ctx, TPM2_Packet* cmd,
}

if (rc == 0 && sensDataSize > 0) {
if (sensDataSize > (UINT16)FWTPM_MAX_PRIVKEY_DER) {
if (sensDataSize > (UINT16)FWTPM_MAX_DATA_BUF) {
rc = TPM_RC_SIZE;
}
if (rc == 0) {
Expand Down Expand Up @@ -7339,7 +7339,10 @@ static TPM_RC FwCmd_StartAuthSession(FWTPM_CTX* ctx, TPM2_Packet* cmd,
XMEMCPY(&bindAuth, &bindObj->authValue, sizeof(TPM2B_AUTH));
}
}
if (bindAuth.size > 0) {
if (bindAuth.size > sizeof(bindAuth.buffer)) {
rc = TPM_RC_FAILURE;
}
Comment thread
dgarske marked this conversation as resolved.
if (rc == 0 && bindAuth.size > 0) {
if (keyInSz + bindAuth.size <= (int)sizeof(keyIn)) {
XMEMCPY(keyIn + keyInSz, bindAuth.buffer, bindAuth.size);
keyInSz += bindAuth.size;
Expand Down Expand Up @@ -11108,31 +11111,46 @@ static TPM_RC FwCmd_Quote(FWTPM_CTX* ctx, TPM2_Packet* cmd,
wcH = FwGetWcHashType(pcrHashAlg);
dSz = TPM2_GetHashDigestSize(pcrHashAlg);
if (wcH != WC_HASH_TYPE_NONE && dSz > 0) {
wc_HashInit(hashCtx, wcH);
for (s = 0; s < numSel; s++) {
int bank = FwGetPcrBankIndex(selections[s].hashAlg);
int bankDSz = TPM2_GetHashDigestSize(
selections[s].hashAlg);
UINT32 j;
if (bank < 0 || bankDSz == 0)
continue;
for (j = 0; j < selections[s].sizeOfSelect; j++) {
int pcr;
for (pcr = 0; pcr < 8; pcr++) {
if (selections[s].pcrSelect[j] & (1 << pcr)) {
int pcrIdx = j * 8 + pcr;
if (pcrIdx < IMPLEMENTATION_PCR) {
wc_HashUpdate(hashCtx, wcH,
ctx->pcrDigest[pcrIdx][bank],
bankDSz);
if (wc_HashInit(hashCtx, wcH) != 0) {
rc = TPM_RC_FAILURE;
}
if (rc == 0) {
for (s = 0; s < numSel && rc == 0; s++) {
int bank = FwGetPcrBankIndex(selections[s].hashAlg);
int bankDSz = TPM2_GetHashDigestSize(
selections[s].hashAlg);
UINT32 j;
if (bank < 0 || bankDSz == 0)
continue;
for (j = 0; j < selections[s].sizeOfSelect &&
rc == 0; j++) {
int pcr;
for (pcr = 0; pcr < 8; pcr++) {
if (selections[s].pcrSelect[j] & (1 << pcr)) {
int pcrIdx = j * 8 + pcr;
if (pcrIdx < IMPLEMENTATION_PCR) {
if (wc_HashUpdate(hashCtx, wcH,
ctx->pcrDigest[pcrIdx][bank],
bankDSz) != 0) {
rc = TPM_RC_FAILURE;
break;
}
}
}
}
}
}
if (rc == 0) {
if (wc_HashFinal(hashCtx, wcH,
pcrDigestBuf) != 0) {
rc = TPM_RC_FAILURE;
}
else {
pcrDigestSz = dSz;
}
}
wc_HashFree(hashCtx, wcH);
}
wc_HashFinal(hashCtx, wcH, pcrDigestBuf);
wc_HashFree(hashCtx, wcH);
pcrDigestSz = dSz;
}
TPM2_Packet_AppendU16(&attestPkt, (UINT16)pcrDigestSz);
TPM2_Packet_AppendBytes(&attestPkt, pcrDigestBuf, pcrDigestSz);
Expand Down Expand Up @@ -11547,8 +11565,13 @@ static TPM_RC FwCmd_NV_Certify(FWTPM_CTX* ctx, TPM2_Packet* cmd,
dSz = TPM2_GetHashDigestSize(nv->nvPublic.nameAlg);
if (wcH != WC_HASH_TYPE_NONE && dSz > 0) {
FwStoreU16BE(nvName.name, nv->nvPublic.nameAlg);
wc_Hash(wcH, nvPubBuf, tmpPkt.pos, nvName.name + 2, dSz);
nvName.size = (UINT16)(2 + dSz);
if (wc_Hash(wcH, nvPubBuf, tmpPkt.pos,
nvName.name + 2, dSz) == 0) {
nvName.size = (UINT16)(2 + dSz);
}
else {
rc = TPM_RC_FAILURE;
}
}
}

Expand Down Expand Up @@ -11738,7 +11761,7 @@ static TPM_RC FwCmd_MakeCredential(FWTPM_CTX* ctx, TPM2_Packet* cmd,
/* patch blob size */
blobSz = rsp->pos - blobStart;
if (blobSz < 0 || blobSz > 0xFFFF ||
encSeedSz < 0 || encSeedSz > 0xFFFF) {
encSeedSz < 0 || encSeedSz > (int)FWTPM_MAX_PUB_BUF) {
rc = TPM_RC_SIZE;
}
if (rc == 0) {
Expand Down Expand Up @@ -11914,6 +11937,9 @@ static TPM_RC FwCmd_ActivateCredential(FWTPM_CTX* ctx, TPM2_Packet* cmd,
objName->name, objName->size,
credOut, (int)sizeof(credOut), &credSz);
}
if (rc == 0 && credSz > (UINT16)sizeof(credOut)) {
rc = TPM_RC_SIZE;
}

/* Build response: TPM2B_DIGEST */
if (rc == 0) {
Expand Down Expand Up @@ -12849,7 +12875,6 @@ int FWTPM_ProcessCommand(FWTPM_CTX* ctx,
cmdAuthCnt++;
}

cmdPkt.pos = authEnd;
cpStart = authEnd; /* cpBuffer starts after auth area */
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/fwtpm/fwtpm_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ int main(int argc, char* argv[])
/* Delete NV state file if --clear was requested */
if (clearNv) {
printf("Clearing NV state file: %s\n", FWTPM_NV_FILE);
remove(FWTPM_NV_FILE);
(void)remove(FWTPM_NV_FILE);
Comment thread
dgarske marked this conversation as resolved.
}

/* Initialize fwTPM */
Expand Down
4 changes: 3 additions & 1 deletion tests/fwtpm_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,9 +429,11 @@ elif [ -x "$TPM2_TOOLS_SCRIPT" ]; then
sleep 0.3
fi
rm -f "$BUILD_DIR/fwtpm_nv.bin"
echo "--- fwtpm_server restart for tpm2-tools ---" \
>> /tmp/fwtpm_check_$$.log
"$FWTPM_SERVER" --port "$FWTPM_PORT" \
--platform-port "$FWTPM_PLAT_PORT" \
> /tmp/fwtpm_check_$$.log 2>&1 &
>> /tmp/fwtpm_check_$$.log 2>&1 &
echo $! > "$PID_FILE"
if ! wait_for_port "$FWTPM_PORT" 500; then
echo "FAIL: fwtpm_server restart failed before tpm2-tools tests"
Expand Down
4 changes: 2 additions & 2 deletions tests/fwtpm_unit_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ int fwtpm_unit_tests(int argc, char *argv[])
printf("fwTPM Unit Tests\n");

/* Remove stale NV state to ensure clean test runs */
remove(FWTPM_NV_FILE);
(void)remove(FWTPM_NV_FILE);

/* Lifecycle */
test_fwtpm_init_cleanup();
Expand Down Expand Up @@ -2142,7 +2142,7 @@ int fwtpm_unit_tests(int argc, char *argv[])
* state, so remove FWTPM_NV_FILE afterwards. */
test_fwtpm_clock_sethal();
test_fwtpm_nv_sethal_mock();
remove(FWTPM_NV_FILE);
(void)remove(FWTPM_NV_FILE);

/* Key operations */
#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
Expand Down
Loading