Skip to content

Bound fwTPM child blob sizes before copying from the response #595

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
dgarske merged 1 commit into from
Sep 10, 2026
Merged

Bound fwTPM child blob sizes before copying from the response #595

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
11 changes: 11 additions & 0 deletions tests/fwtpm_unit_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
Assert(_x > _y, ("%s > %s", #x, #y), \
("%d <= %d", _x, _y)); \
} while(0)
#define AssertIntLE(x, y) do { \
int _x = (int)(x); int _y = (int)(y); \
Assert(_x <= _y, ("%s <= %s", #x, #y), \
("%d > %d", _x, _y)); \
} while(0)

/* ================================================================== */
/* Packet building helpers */
Expand Down Expand Up @@ -10533,11 +10538,17 @@ static void CreateChildBlobs(FWTPM_CTX* ctx, UINT32 parent,
AssertIntEQ(GetRspRC(gRsp), TPM_RC_SUCCESS);

pos = TPM2_HEADER_SIZE + 4; /* skip parameterSize */
AssertIntLE(pos + 2, rspSize); /* size field present */
*privSz = GetU16BE(gRsp + pos); pos += 2;
AssertIntGT(*privSz, 0);
AssertIntLE(*privSz, sizeof(TPM2B_PRIVATE)); /* fits caller's buffer */
AssertIntLE(pos + *privSz, rspSize); /* payload present */
memcpy(priv, gRsp + pos, *privSz); pos += *privSz;
AssertIntLE(pos + 2, rspSize); /* size field present */
*pubSz = GetU16BE(gRsp + pos);
AssertIntGT(*pubSz, 0);
AssertIntLE(2 + *pubSz, sizeof(TPM2B_PUBLIC)); /* fits caller's buffer */
AssertIntLE(pos + 2 + *pubSz, rspSize); /* payload present */
memcpy(pub, gRsp + pos, 2 + *pubSz); /* keep the size prefix */
}

Expand Down
Loading