| Message ID | 20210504124842.220445-3-jandryuk@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | vtpmmgr: Some fixes - still incomplete | expand |
Jason Andryuk, le mar. 04 mai 2021 08:48:35 -0400, a ecrit: > tpm_get_error_name returns "Unknown Error Code" when an error string > is not defined. In that case, we should print the Error Code so it can > be looked up offline. tpm_get_error_name returns a const string, so > just have the two callers always print the error code so it is always > available. > > Signed-off-by: Jason Andryuk <jandryuk@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > stubdom/vtpmmgr/tpm.c | 2 +- > stubdom/vtpmmgr/tpm2.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/stubdom/vtpmmgr/tpm.c b/stubdom/vtpmmgr/tpm.c > index 779cddd64e..83b2bc16b2 100644 > --- a/stubdom/vtpmmgr/tpm.c > +++ b/stubdom/vtpmmgr/tpm.c > @@ -109,7 +109,7 @@ > UINT32 rsp_status; \ > UNPACK_OUT(TPM_RSP_HEADER, &rsp_tag, &rsp_len, &rsp_status); \ > if (rsp_status != TPM_SUCCESS) { \ > - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(rsp_status)); \ > + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(rsp_status), rsp_status); \ > status = rsp_status; \ > goto abort_egress; \ > } \ > diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c > index c9f1016ab5..655e6d164c 100644 > --- a/stubdom/vtpmmgr/tpm2.c > +++ b/stubdom/vtpmmgr/tpm2.c > @@ -126,7 +126,7 @@ > ptr = unpack_TPM_RSP_HEADER(ptr, \ > &(tag), &(paramSize), &(status));\ > if ((status) != TPM_SUCCESS){ \ > - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(status));\ > + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(status), (status));\ > goto abort_egress;\ > }\ > } while(0) > -- > 2.30.2 >
On 5/4/21 8:48 AM, Jason Andryuk wrote: > tpm_get_error_name returns "Unknown Error Code" when an error string > is not defined. In that case, we should print the Error Code so it can > be looked up offline. tpm_get_error_name returns a const string, so > just have the two callers always print the error code so it is always > available. > > Signed-off-by: Jason Andryuk <jandryuk@gmail.com> > --- Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com> > stubdom/vtpmmgr/tpm.c | 2 +- > stubdom/vtpmmgr/tpm2.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/stubdom/vtpmmgr/tpm.c b/stubdom/vtpmmgr/tpm.c > index 779cddd64e..83b2bc16b2 100644 > --- a/stubdom/vtpmmgr/tpm.c > +++ b/stubdom/vtpmmgr/tpm.c > @@ -109,7 +109,7 @@ > UINT32 rsp_status; \ > UNPACK_OUT(TPM_RSP_HEADER, &rsp_tag, &rsp_len, &rsp_status); \ > if (rsp_status != TPM_SUCCESS) { \ > - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(rsp_status)); \ > + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(rsp_status), rsp_status); \ > status = rsp_status; \ > goto abort_egress; \ > } \ > diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c > index c9f1016ab5..655e6d164c 100644 > --- a/stubdom/vtpmmgr/tpm2.c > +++ b/stubdom/vtpmmgr/tpm2.c > @@ -126,7 +126,7 @@ > ptr = unpack_TPM_RSP_HEADER(ptr, \ > &(tag), &(paramSize), &(status));\ > if ((status) != TPM_SUCCESS){ \ > - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(status));\ > + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(status), (status));\ > goto abort_egress;\ > }\ > } while(0) >
diff --git a/stubdom/vtpmmgr/tpm.c b/stubdom/vtpmmgr/tpm.c index 779cddd64e..83b2bc16b2 100644 --- a/stubdom/vtpmmgr/tpm.c +++ b/stubdom/vtpmmgr/tpm.c @@ -109,7 +109,7 @@ UINT32 rsp_status; \ UNPACK_OUT(TPM_RSP_HEADER, &rsp_tag, &rsp_len, &rsp_status); \ if (rsp_status != TPM_SUCCESS) { \ - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(rsp_status)); \ + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(rsp_status), rsp_status); \ status = rsp_status; \ goto abort_egress; \ } \ diff --git a/stubdom/vtpmmgr/tpm2.c b/stubdom/vtpmmgr/tpm2.c index c9f1016ab5..655e6d164c 100644 --- a/stubdom/vtpmmgr/tpm2.c +++ b/stubdom/vtpmmgr/tpm2.c @@ -126,7 +126,7 @@ ptr = unpack_TPM_RSP_HEADER(ptr, \ &(tag), &(paramSize), &(status));\ if ((status) != TPM_SUCCESS){ \ - vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(status));\ + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s (%x)\n", tpm_get_error_name(status), (status));\ goto abort_egress;\ }\ } while(0)
tpm_get_error_name returns "Unknown Error Code" when an error string is not defined. In that case, we should print the Error Code so it can be looked up offline. tpm_get_error_name returns a const string, so just have the two callers always print the error code so it is always available. Signed-off-by: Jason Andryuk <jandryuk@gmail.com> --- stubdom/vtpmmgr/tpm.c | 2 +- stubdom/vtpmmgr/tpm2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)