From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWp5X-0006Fh-Tn for qemu-devel@nongnu.org; Tue, 11 Dec 2018 15:57:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWp5U-0003jR-Ei for qemu-devel@nongnu.org; Tue, 11 Dec 2018 15:57:07 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34124 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWp5U-0003io-6J for qemu-devel@nongnu.org; Tue, 11 Dec 2018 15:57:04 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wBBKsEOP013722 for ; Tue, 11 Dec 2018 15:57:03 -0500 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0b-001b2d01.pphosted.com with ESMTP id 2pakv3agw5-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Dec 2018 15:57:03 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Dec 2018 20:57:02 -0000 From: Stefan Berger Date: Tue, 11 Dec 2018 15:56:53 -0500 In-Reply-To: <20181211205654.3550341-1-stefanb@linux.vnet.ibm.com> References: <20181211205654.3550341-1-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Message-Id: <20181211205654.3550341-3-stefanb@linux.vnet.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 2/3] tpm: Make sure new locality passed to tpm_tis_prep_abort() is valid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Stefan Berger , Stefan Berger 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 Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/tpm/tpm_tis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 176d424ed9..04e4ad9212 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -263,7 +263,9 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t l= octy, uint8_t newlocty) { uint8_t busy_locty; =20 - s->aborting_locty =3D locty; + assert(TPM_TIS_IS_VALID_LOCTY(newlocty)); + + s->aborting_locty =3D locty; /* may also be TPM_TIS_NO_LOCALITY */ s->next_locty =3D newlocty; /* locality after successful abort */ =20 /* --=20 2.17.1