Skip to content

tss: Reset size/count fields on unmarshaling failures to prevent reus… #46

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

Open
Mrcopytuo wants to merge 5 commits into
base: main
Choose a base branch
from
Open

tss: Reset size/count fields on unmarshaling failures to prevent reus… #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6548a7a
Bump dawidd6/action-download-artifact from 7 to 8
dependabot[bot] Jan 23, 2025
4914b29
Merge pull request #35 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Jan 24, 2025
bc88a47
Bump dawidd6/action-download-artifact from 8 to 9
dependabot[bot] Feb 28, 2025
6777a74
Merge pull request #36 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Feb 28, 2025
e19f511
tss: Reset size/count fields on unmarshaling failures to prevent reus…
Mrcopytuo Dec 12, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
run: |
brew install create-dmg

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_macos

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_w64

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
7 changes: 7 additions & 0 deletions qemu-8.0.0/roms/skiboot/libstb/tss2/ibmtpm20tss/utils/Commands12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ ActivateIdentity_In_Unmarshal(ActivateIdentity_In *target, BYTE **buffer, uint32
if (rc == 0) {
if (target->blobSize > sizeof(target->blob)) {
rc = TPM_RC_SIZE;
target->blobSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -181,6 +182,7 @@ GetCapability12_In_Unmarshal(GetCapability12_In *target, BYTE **buffer, uint32_t
if (rc == 0) {
if (target->subCapSize > sizeof(target->subCap)) {
rc = TPM_RC_SIZE;
target->subCapSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -326,6 +328,7 @@ NV_WriteValue_In_Unmarshal(NV_WriteValue_In *target, BYTE **buffer, uint32_t *si
if (rc == 0) {
if (target->dataSize > sizeof(target->data)) {
rc = TPM_RC_SIZE;
target->dataSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -360,6 +363,7 @@ NV_WriteValueAuth_In_Unmarshal(NV_WriteValueAuth_In *target, BYTE **buffer, uint
if (rc == 0) {
if (target->dataSize > sizeof(target->data)) {
rc = TPM_RC_SIZE;
target->dataSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -516,6 +520,7 @@ Sign12_In_Unmarshal(Sign12_In *target, BYTE **buffer, uint32_t *size, TPM_HANDLE
if (rc == 0) {
if (target->areaToSignSize > sizeof(target->areaToSign)) {
rc = TPM_RC_SIZE;
target->areaToSignSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -563,6 +568,7 @@ TakeOwnership_In_Unmarshal(TakeOwnership_In *target, BYTE **buffer, uint32_t *si
if (rc == 0) {
if (target->encOwnerAuthSize > sizeof(target->encOwnerAuth)) {
rc = TPM_RC_SIZE;
target->encOwnerAuthSize = 0;
}
}
if (rc == 0) {
Expand All @@ -580,6 +586,7 @@ TakeOwnership_In_Unmarshal(TakeOwnership_In *target, BYTE **buffer, uint32_t *si
if (rc == 0) {
if (target->encSrkAuthSize > sizeof(target->encSrkAuth)) {
rc = TPM_RC_SIZE;
target->encSrkAuthSize = 0;
}
}
if (rc == 0) {
Expand Down
24 changes: 24 additions & 0 deletions qemu-8.0.0/roms/skiboot/libstb/tss2/ibmtpm20tss/utils/Unmarshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ TSS_TPM2B_Unmarshalu(TPM2B *target, uint16_t targetSize, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->size > targetSize) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
Expand Down Expand Up @@ -1601,6 +1602,7 @@ TSS_TPML_CC_Unmarshalu(TPML_CC *target, BYTE **buffer, uint32_t *size)
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_CAP_CC) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1623,6 +1625,7 @@ TSS_TPML_CCA_Unmarshalu(TPML_CCA *target, BYTE **buffer, uint32_t *size)
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_CAP_CC) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1645,6 +1648,7 @@ TSS_TPML_ALG_Unmarshalu(TPML_ALG *target, BYTE **buffer, uint32_t *size)
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_ALG_LIST_SIZE) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1667,6 +1671,7 @@ TSS_TPML_HANDLE_Unmarshalu(TPML_HANDLE *target, BYTE **buffer, uint32_t *size)
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_CAP_HANDLES) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1693,11 +1698,13 @@ TSS_TPML_DIGEST_Unmarshalu(TPML_DIGEST *target, BYTE **buffer, uint32_t *size, u
if (rc == TPM_RC_SUCCESS) {
if (target->count < minCount) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
if (target->count > 8) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1720,6 +1727,7 @@ TSS_TPML_DIGEST_VALUES_Unmarshalu(TPML_DIGEST_VALUES *target, BYTE **buffer, uin
if (rc == TPM_RC_SUCCESS) {
if (target->count > HASH_COUNT) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1742,6 +1750,7 @@ TSS_TPML_PCR_SELECTION_Unmarshalu(TPML_PCR_SELECTION *target, BYTE **buffer, uin
if (rc == TPM_RC_SUCCESS) {
if (target->count > HASH_COUNT) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1764,6 +1773,7 @@ TSS_TPML_ALG_PROPERTY_Unmarshalu(TPML_ALG_PROPERTY *target, BYTE **buffer, uint3
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_CAP_ALGS) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1786,6 +1796,7 @@ TSS_TPML_TAGGED_TPM_PROPERTY_Unmarshalu(TPML_TAGGED_TPM_PROPERTY *target, BYTE
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_TPM_PROPERTIES) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1808,6 +1819,7 @@ TSS_TPML_TAGGED_PCR_PROPERTY_Unmarshalu(TPML_TAGGED_PCR_PROPERTY *target, BYTE *
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_PCR_PROPERTIES) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1830,6 +1842,7 @@ TSS_TPML_ECC_CURVE_Unmarshalu(TPML_ECC_CURVE *target, BYTE **buffer, uint32_t *s
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_ECC_CURVES) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand All @@ -1852,6 +1865,7 @@ TSS_TPML_TAGGED_POLICY_Unmarshalu(TPML_TAGGED_POLICY *target, BYTE **buffer, uin
if (rc == TPM_RC_SUCCESS) {
if (target->count > MAX_TAGGED_POLICIES) {
rc = TPM_RC_SIZE;
target->count = 0;
}
}
for (i = 0 ; (rc == TPM_RC_SUCCESS) && (i < target->count) ; i++) {
Expand Down Expand Up @@ -2439,6 +2453,7 @@ TSS_TPM2B_SENSITIVE_CREATE_Unmarshalu(TPM2B_SENSITIVE_CREATE *target, BYTE **buf
if (rc == TPM_RC_SUCCESS) {
if (target->size == 0) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
Expand All @@ -2450,6 +2465,7 @@ TSS_TPM2B_SENSITIVE_CREATE_Unmarshalu(TPM2B_SENSITIVE_CREATE *target, BYTE **buf
if (rc == TPM_RC_SUCCESS) {
if (target->size != startSize - *size) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
return rc;
Expand Down Expand Up @@ -3134,6 +3150,7 @@ TSS_TPM2B_ECC_POINT_Unmarshalu(TPM2B_ECC_POINT *target, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->size == 0) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
Expand All @@ -3145,6 +3162,7 @@ TSS_TPM2B_ECC_POINT_Unmarshalu(TPM2B_ECC_POINT *target, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->size != startSize - *size) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
return rc;
Expand Down Expand Up @@ -3641,6 +3659,7 @@ TSS_TPM2B_PUBLIC_Unmarshalu(TPM2B_PUBLIC *target, BYTE **buffer, uint32_t *size,
if (rc == TPM_RC_SUCCESS) {
if (target->size == 0) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
Expand All @@ -3652,6 +3671,7 @@ TSS_TPM2B_PUBLIC_Unmarshalu(TPM2B_PUBLIC *target, BYTE **buffer, uint32_t *size,
if (rc == TPM_RC_SUCCESS) {
if (target->size != startSize - *size) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
return rc;
Expand Down Expand Up @@ -3748,6 +3768,7 @@ TSS_TPM2B_SENSITIVE_Unmarshalu(TPM2B_SENSITIVE *target, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->t.size != startSize - *size) {
rc = TPM_RC_SIZE;
target->t.size = 0;
}
}
}
Expand Down Expand Up @@ -3839,6 +3860,7 @@ TSS_TPM2B_NV_PUBLIC_Unmarshalu(TPM2B_NV_PUBLIC *target, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->size == 0) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == TPM_RC_SUCCESS) {
Expand All @@ -3850,6 +3872,7 @@ TSS_TPM2B_NV_PUBLIC_Unmarshalu(TPM2B_NV_PUBLIC *target, BYTE **buffer, uint32_t
if (rc == TPM_RC_SUCCESS) {
if (target->size != startSize - *size) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
return rc;
Expand Down Expand Up @@ -3979,6 +4002,7 @@ TSS_TPM2B_CREATION_DATA_Unmarshalu(TPM2B_CREATION_DATA *target, BYTE **buffer, u
if (rc == TPM_RC_SUCCESS) {
if (target->size != startSize - *size) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
return rc;
Expand Down
7 changes: 7 additions & 0 deletions qemu-8.0.0/roms/skiboot/libstb/tss2/ibmtpm20tss/utils/Unmarshal12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ TSS_TPM_PCR_SELECTION_Unmarshalu(TPM_PCR_SELECTION *target, BYTE **buffer, uint3
if (rc == 0) {
if (target->sizeOfSelect > sizeof(target->pcrSelect)) {
rc = TPM_RC_SIZE;
target->sizeOfSelect = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -219,6 +220,7 @@ TSS_TPM_SYMMETRIC_KEY_Unmarshalu(TPM_SYMMETRIC_KEY *target, BYTE **buffer, uint3
if (rc == 0) {
if (target->size > sizeof(target->data)) {
rc = TPM_RC_SIZE;
target->size = 0;
}
}
if (rc == 0) {
Expand All @@ -245,6 +247,7 @@ TSS_TPM_RSA_KEY_PARMS_Unmarshalu(TPM_RSA_KEY_PARMS *target, BYTE **buffer, uint3
if (rc == 0) {
if (target->exponentSize > sizeof(target->exponent)) {
rc = TPM_RC_SIZE;
target->exponentSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -360,6 +363,7 @@ TSS_TPM_STORE_PUBKEY_Unmarshalu(TPM_STORE_PUBKEY *target, BYTE **buffer, uint32_
if (rc == 0) {
if (target->keyLength > sizeof(target->key)) {
rc = TPM_RC_SIZE;
target->keyLength = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -457,6 +461,7 @@ TSS_TPM_CAP_VERSION_INFO_Unmarshalu(TPM_CAP_VERSION_INFO *target, BYTE **buffer,
if (rc == 0) {
if (target->vendorSpecificSize > sizeof(target->vendorSpecific)) {
rc = TPM_RC_SIZE;
target->vendorSpecificSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -493,6 +498,7 @@ TSS_TPM_DA_INFO_Unmarshalu(TPM_DA_INFO *target, BYTE **buffer, uint32_t *size)
if (rc == 0) {
if (target->vendorDataSize > sizeof(target->vendorData)) {
rc = TPM_RC_SIZE;
target->vendorDataSize = 0;
}
}
if (rc == 0) {
Expand Down Expand Up @@ -520,6 +526,7 @@ TSS_TPM_DA_INFO_LIMITED_Unmarshalu(TPM_DA_INFO_LIMITED *target, BYTE **buffer, u
if (rc == 0) {
if (target->vendorDataSize > sizeof(target->vendorData)) {
rc = TPM_RC_SIZE;
target->vendorDataSize = 0;
}
}
if (rc == 0) {
Expand Down
Loading