From patchwork Fri Feb 15 13:35:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 10814975 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 06A926C2 for ; Fri, 15 Feb 2019 13:41:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E91592F51C for ; Fri, 15 Feb 2019 13:41:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E712E2F528; Fri, 15 Feb 2019 13:41:08 +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 87F4D2F52C for ; Fri, 15 Feb 2019 13:41:08 +0000 (UTC) Received: from localhost ([127.0.0.1]:40061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gudjn-0003eF-Oe for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Feb 2019 08:41:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gudeR-0000P3-9f for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:35:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gudeQ-0008FJ-CJ for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:35:35 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:43632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gudeN-00087y-Rp for qemu-devel@nongnu.org; Fri, 15 Feb 2019 08:35:32 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1FDYbpL087317; Fri, 15 Feb 2019 13:35:24 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=drpJKbR7ITW7GhrWV3fIu0TcaupMVHuAZeOg/jWY90c=; b=ifwQ1teUD8U2SZKXUkIBoeYk4VXjxpRmLDDZikjgefzUoMGSG9nc4sex4WSdz+27XeiU ch9xcBpfKXXHyIhgjwxFpps5sd7iACqzR6IWThrXOTk2ExVHp6FtvMyXtYsdGXHjqWzB 77keeBHU6chdYYGikwX04+yBxJTv9Sd36adRmE5rQ9/cvDp9jMF3+E0T5xgcpHeDYx0r UjPs/4GboWvbfFQnOCrTxftvwOLHZTUemaIj8XZ8gIxxy22Z2X6D1ZBcfjHRKShMdUno ao3G8DCbuGTO+xOV3sytBpE9AUQvImmQCANvIEI/nfW7ClpavAQr0b+eIlzx61o/zMk9 Zg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2qhrekwv5q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 15 Feb 2019 13:35:24 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1FDZNVM001198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 15 Feb 2019 13:35:23 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1FDZNMt019137; Fri, 15 Feb 2019 13:35:23 GMT Received: from ol7.uk.oracle.com (/10.175.220.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 15 Feb 2019 13:35:23 +0000 From: Liam Merwick To: stefanb@linux.ibm.com, qemu-devel@nongnu.org Date: Fri, 15 Feb 2019 13:35:18 +0000 Message-Id: <1550237719-28355-2-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550237719-28355-1-git-send-email-liam.merwick@oracle.com> References: <1550237719-28355-1-git-send-email-liam.merwick@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9167 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=702 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902150097 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH v5 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 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,