From patchwork Tue Feb 12 20:48:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 10808673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FE8E13B4 for ; Tue, 12 Feb 2019 20:58:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FA2B2C1A7 for ; Tue, 12 Feb 2019 20:58:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63E9F2C690; Tue, 12 Feb 2019 20:58:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 18C402C1A7 for ; Tue, 12 Feb 2019 20:58:29 +0000 (UTC) Received: from localhost ([127.0.0.1]:45991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtf8N-0007Zt-Ea for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Feb 2019 15:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtf4o-0005Y9-Bz for qemu-devel@nongnu.org; Tue, 12 Feb 2019 15:54:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtez5-0007Ui-14 for qemu-devel@nongnu.org; Tue, 12 Feb 2019 15:48:55 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:56446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gteyz-0007Km-Oi for qemu-devel@nongnu.org; Tue, 12 Feb 2019 15:48:48 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1CKmeuD170876; Tue, 12 Feb 2019 20:48:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=FLWKovuzG6r6fg+nuVlkdeFl2kLCTHDfhEwScWAVyUU=; b=yDIhvZh41thInKrcvhh+uCW0vmRXQnGM67iJ1Lxi0IN1n1pV1rqy+jZjJwNAFtVhnMCg b3ihQpmgnzeFWa3WmhHG8XRQ2e1nlqZElZz4Y0VcsGPiCbT3DbmmOpxHw/QXmjZE1QQ8 8x7GSz8Ba1CDBElfBubAlYtsRIROBeakSXlpaviyYysE0ELUnTMtrrl7WW25GClbtOOk XVyo7wCO/1Dn/+joLcI2gQeoMEQQ+xyZpG5rktxte4sXry0bLIVN45N13JpSRJfgsgA6 YBjmvkzgXTyTn3JSGguaW8TIJ54Z7rXL9q2RoCcPjnTHr6qOyNxlhZhbGTWiLrw20Yb0 UQ== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2qhre5eatu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 20:48:39 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x1CKmaWC017623 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 20:48:36 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x1CKma0T026056; Tue, 12 Feb 2019 20:48:36 GMT Received: from ol7.uk.oracle.com (/10.175.218.157) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 12 Feb 2019 12:48:35 -0800 From: Liam Merwick To: stefanb@linux.ibm.com, qemu-devel@nongnu.org Date: Tue, 12 Feb 2019 20:48:19 +0000 Message-Id: <1550004500-24485-2-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550004500-24485-1-git-send-email-liam.merwick@oracle.com> References: <1550004500-24485-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=692 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902120145 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH v3 2/3] tpm_tis: assert valid addr passed to tpm_tis_locality_from_addr() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Assert that the address passed in results in a valid locality value. Current callers pass a valid address so this is just a defensive check to prevent a future caller passing an incorrect address or catch if the MMIO address parameters were not all modified correctly. This is to help static code analysis tools that report that no explicit checking is being done. Signed-off-by: Liam Merwick --- 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 61a130beef35..772431f20874 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -100,7 +100,9 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr, static uint8_t tpm_tis_locality_from_addr(hwaddr addr) { - return (uint8_t)((addr >> TPM_TIS_LOCALITY_SHIFT) & 0x7); + uint8_t locty = (uint8_t)(addr >> TPM_TIS_LOCALITY_SHIFT); + assert(TPM_TIS_IS_VALID_LOCTY(locty)); + return locty; } static void tpm_tis_show_buffer(const unsigned char *buffer,