| Message ID | 20210506135923.161427-11-jandryuk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vtpmmgr: Some fixes - still incomplete | expand |
Jason Andryuk, le jeu. 06 mai 2021 09:59:20 -0400, a ecrit: > The UINT32 <-> UINT16 casting in TPM2_GetRandom is incorrect. Use a > local UINT16 as needed for the TPM hardware command and assign the > result. > > Suggested-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > Signed-off-by: Jason Andryuk <jandryuk@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > stubdom/vtpmmgr/tpm2.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c > index 655e6d164c..ebd06eac74 100644 > --- a/stubdom/vtpmmgr/tpm2.c > +++ b/stubdom/vtpmmgr/tpm2.c > @@ -427,15 +427,22 @@ abort_egress: > > TPM_RC TPM2_GetRandom(UINT32 * bytesRequested, BYTE * randomBytes) > { > + UINT16 bytesReq; > TPM_BEGIN(TPM_ST_NO_SESSIONS, TPM_CC_GetRandom); > > - ptr = pack_UINT16(ptr, (UINT16)*bytesRequested); > + if (*bytesRequested > UINT16_MAX) > + bytesReq = UINT16_MAX; > + else > + bytesReq = *bytesRequested; > + > + ptr = pack_UINT16(ptr, bytesReq); > > TPM_TRANSMIT(); > TPM_UNPACK_VERIFY(); > > - ptr = unpack_UINT16(ptr, (UINT16 *)bytesRequested); > - ptr = unpack_TPM_BUFFER(ptr, randomBytes, *bytesRequested); > + ptr = unpack_UINT16(ptr, &bytesReq); > + *bytesRequested = bytesReq; > + ptr = unpack_TPM_BUFFER(ptr, randomBytes, bytesReq); > > abort_egress: > return status; > -- > 2.30.2 >
On 5/6/21 9:59 AM, Jason Andryuk wrote: > The UINT32 <-> UINT16 casting in TPM2_GetRandom is incorrect. Use a > local UINT16 as needed for the TPM hardware command and assign the > result. > > Suggested-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > Signed-off-by: Jason Andryuk <jandryuk@gmail.com> > --- Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com> > stubdom/vtpmmgr/tpm2.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c > index 655e6d164c..ebd06eac74 100644 > --- a/stubdom/vtpmmgr/tpm2.c > +++ b/stubdom/vtpmmgr/tpm2.c > @@ -427,15 +427,22 @@ abort_egress: > > TPM_RC TPM2_GetRandom(UINT32 * bytesRequested, BYTE * randomBytes) > { > + UINT16 bytesReq; > TPM_BEGIN(TPM_ST_NO_SESSIONS, TPM_CC_GetRandom); > > - ptr = pack_UINT16(ptr, (UINT16)*bytesRequested); > + if (*bytesRequested > UINT16_MAX) > + bytesReq = UINT16_MAX; > + else > + bytesReq = *bytesRequested; > + > + ptr = pack_UINT16(ptr, bytesReq); > > TPM_TRANSMIT(); > TPM_UNPACK_VERIFY(); > > - ptr = unpack_UINT16(ptr, (UINT16 *)bytesRequested); > - ptr = unpack_TPM_BUFFER(ptr, randomBytes, *bytesRequested); > + ptr = unpack_UINT16(ptr, &bytesReq); > + *bytesRequested = bytesReq; > + ptr = unpack_TPM_BUFFER(ptr, randomBytes, bytesReq); > > abort_egress: > return status; >
diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c index 655e6d164c..ebd06eac74 100644 --- a/stubdom/vtpmmgr/tpm2.c +++ b/stubdom/vtpmmgr/tpm2.c @@ -427,15 +427,22 @@ abort_egress: TPM_RC TPM2_GetRandom(UINT32 * bytesRequested, BYTE * randomBytes) { + UINT16 bytesReq; TPM_BEGIN(TPM_ST_NO_SESSIONS, TPM_CC_GetRandom); - ptr = pack_UINT16(ptr, (UINT16)*bytesRequested); + if (*bytesRequested > UINT16_MAX) + bytesReq = UINT16_MAX; + else + bytesReq = *bytesRequested; + + ptr = pack_UINT16(ptr, bytesReq); TPM_TRANSMIT(); TPM_UNPACK_VERIFY(); - ptr = unpack_UINT16(ptr, (UINT16 *)bytesRequested); - ptr = unpack_TPM_BUFFER(ptr, randomBytes, *bytesRequested); + ptr = unpack_UINT16(ptr, &bytesReq); + *bytesRequested = bytesReq; + ptr = unpack_TPM_BUFFER(ptr, randomBytes, bytesReq); abort_egress: return status;
The UINT32 <-> UINT16 casting in TPM2_GetRandom is incorrect. Use a local UINT16 as needed for the TPM hardware command and assign the result. Suggested-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Jason Andryuk <jandryuk@gmail.com> --- stubdom/vtpmmgr/tpm2.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)