]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
tpm: Make sure new locality passed to tpm_tis_prep_abort() is valid
authorStefan Berger <stefanb@linux.vnet.ibm.com>
Tue, 20 Nov 2018 18:14:51 +0000 (13:14 -0500)
committerStefan Berger <stefanb@linux.vnet.ibm.com>
Tue, 4 Dec 2018 15:21:25 +0000 (10:21 -0500)
Make sure that the new locality passed to tpm_tis_prep_abort()
is valid.

Add a comment to aborting_locty that it may be any locality, including
TPM_TIS_NO_LOCALITY.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
hw/tpm/tpm_tis.c

index 176d424ed9c43f105ff8d5c05ca144c20900cfb0..04e4ad9212d67c0fa5381d6f948d653c79a3600f 100644 (file)
@@ -263,7 +263,9 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t locty, uint8_t newlocty)
 {
     uint8_t busy_locty;
 
-    s->aborting_locty = locty;
+    assert(TPM_TIS_IS_VALID_LOCTY(newlocty));
+
+    s->aborting_locty = locty; /* may also be TPM_TIS_NO_LOCALITY */
     s->next_locty = newlocty;  /* locality after successful abort */
 
     /*