From patchwork Fri May 18 17:19:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 136331 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1507815lji; Fri, 18 May 2018 10:26:01 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqqUD7H6L3lrrBPKkuWYXGvG9xn3WdR7cbAsF6by89AMRfyZzlH+07STJXkYJflAAIt6n98 X-Received: by 2002:a0c:e609:: with SMTP id z9-v6mr9816756qvm.158.1526664361340; Fri, 18 May 2018 10:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526664361; cv=none; d=google.com; s=arc-20160816; b=CKBz7Rmpa7BF/sfbU5ixldfFocn4NvuZcEe1Z0kMkOgx3Y9nx1hBneVcsN80zWxZrb JnM6CdVpphB5h5ctSLH0ML78FZ+SWq1ydXEElCMdKZMyQA/bR57Tprmheu2l0tf3p+43 i85lo9Ee8vmaiKFJmki1Jc9I2TTcbP6/72YPizB+z75uxtDsQB3ZXVaYoAelOnbLCkwF b1EKDYx/gcw4d89RuWWjeAYwHyBbXu1K8rKlwknhKjqbIbwJVjAmBbP33QumlynT1pG1 JbXRJnbBZc27q/uDr8gC/WfOvyiLSdCv6UpdPEMe8h2aPJnNdn3dgOKOZ4H+dw/7rp8P KV4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=kh/tpyrv2TRdet1AlcCiPDhDVURuzjNvxPf1+hLqFoU=; b=rNjnrmPsUNAeUEwN7THqcKo5C0Rc68XnZfJg8YntVTrjM6hrnJ/M4eBUD48x0Js4XS e4k0YUWVxYOV9feed2DF07rQb72iMKf/mciNGHZsDbKCOeDjLbheWDUGrBu0mTE3/cf8 h3O/+YDoBMMlDG3PAHSBtk8JPtWSZrh87JJdmPygxALhpmwiOWOuPOGp/K3hkCTW0dcV ueKGuB7CPUiahHGn92H0fu4B9/BJbh+qozBRuAnnBfOfTpBoT8FHGbWLl3Co9lWhM+Vw B3RxjepAncoMUBfWXLBDPxmjcaQPaNJMEkdMQk1IdpvjWS8otNNZdU4F1F+hFiORBu1s Sp1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 206-v6si1579693qkn.162.2018.05.18.10.26.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 May 2018 10:26:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJj8i-0004nS-I3 for patch@linaro.org; Fri, 18 May 2018 13:26:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJj3B-0000ZZ-98 for qemu-devel@nongnu.org; Fri, 18 May 2018 13:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJj3A-0007Rr-GI for qemu-devel@nongnu.org; Fri, 18 May 2018 13:20:17 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:41780) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fJj3A-0007Oi-AJ for qemu-devel@nongnu.org; Fri, 18 May 2018 13:20:16 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fJj39-0004mI-BC for qemu-devel@nongnu.org; Fri, 18 May 2018 18:20:15 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 May 2018 18:19:44 +0100 Message-Id: <20180518172009.14416-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518172009.14416-1-peter.maydell@linaro.org> References: <20180518172009.14416-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 07/32] hw/arm/smmu-common: Fix coverity issue in get_block_pte_address 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger Coverity points out that this can overflow if n > 31, because it's only doing 32-bit arithmetic. Let's use 1ULL instead of 1. Also the formulae used to compute n can be replaced by the level_shift() macro. Reported-by: Peter Maydell Signed-off-by: Eric Auger Reviewed-by: Philippe Mathieu-Daudé Message-id: 1526493784-25328-3-git-send-email-eric.auger@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/smmu-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.0 diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 01c7be82b6..3c5f7245b5 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -83,9 +83,9 @@ static inline hwaddr get_table_pte_address(uint64_t pte, int granule_sz) static inline hwaddr get_block_pte_address(uint64_t pte, int level, int granule_sz, uint64_t *bsz) { - int n = (granule_sz - 3) * (4 - level) + 3; + int n = level_shift(level, granule_sz); - *bsz = 1 << n; + *bsz = 1ULL << n; return PTE_ADDRESS(pte, n); }