From patchwork Mon Nov 13 17:32:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 743470 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp1747614wrw; Mon, 13 Nov 2023 09:34:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrLyQdP4sHrFieK/WYMuRdVuVqr6B7fePxv7lWB1xeAad13oKBQAET9X4nBlBV7j3kdwaF X-Received: by 2002:a0c:eb0b:0:b0:66d:1e8f:bb98 with SMTP id j11-20020a0ceb0b000000b0066d1e8fbb98mr5655723qvp.59.1699896894359; Mon, 13 Nov 2023 09:34:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699896894; cv=none; d=google.com; s=arc-20160816; b=UGeePwumysRLCuZuU5pJnE4IAKJy9UU+mzZT7DBWlsZP7XpD5iWmJ4AEGUCheNU8eh 5BExVvk+mJDqWQA1FLD8/ehOH+YaTi1JWueYf8l9kDiimE4dX5MxWBodOZhECrwMVdjH gNrxVsqE47jAmDaoxxbtP4iP2MyALXq6fvHPSjnwtCmGU45VvKeHbkMWtRDKRXUOjc/T EyZyRrHcM0VNSwfLJTvarL+YVt6pMnS7NSQXEwaDw04Rb2itMqFc8DzkDlDnXIeN2WqA WsFSrnIFi1OgVL/jEM0Kl65kDu7BD/mtZdMdqYXuoDPWnVUXWBjA/BY/vOSojBap1+cF dqSw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7D/Is0q9/XY5O6mimvb47xPlpmUh6SE4PEHCKmELxsQ=; fh=GQHtCn/E3suSoDw0oyVI1IVtbfZwNmpadSzuYPhysFY=; b=dHI3ChhGgXWudIIQuIej38x3FrQ7uqYKKgrc3KB4HLWYoO5MqaQd2js/3GUOE6HEW7 oyYSl9LbqLE5QLuqVe/Kg8McEx64IPzOWrrK1dWPSWb6FkgCyNMnLAIpZMPV7Sjf0sIi WAAG3EDFE4pnA8gPpUkXA63Avyj7MRoWWk0BY5PrAXiBFkM2AT1mGFq0hWW6bLUg17rm Xq0mHNgfSKxSEpFR/FcTdMsN3+wmD0rA82J4fz35PEhahi7DLC/5RvZ8hb7dfhMmeKrt AhwI4hXME9W8+Ez7aBSv34CR64FND7W1eb73hq1palAyKCc3WD7dk9OCpM8xQFNV8FhX lZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VgeO/N55"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b5-20020a0cfb45000000b00670b0ffe6fasi4895981qvq.492.2023.11.13.09.34.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Nov 2023 09:34:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VgeO/N55"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2ao6-0001Z1-6v; Mon, 13 Nov 2023 12:33:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2anx-0001Uk-Om for qemu-devel@nongnu.org; Mon, 13 Nov 2023 12:32:59 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2ank-0000vD-6l for qemu-devel@nongnu.org; Mon, 13 Nov 2023 12:32:57 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1ce3084c2d1so4944425ad.3 for ; Mon, 13 Nov 2023 09:32:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699896763; x=1700501563; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7D/Is0q9/XY5O6mimvb47xPlpmUh6SE4PEHCKmELxsQ=; b=VgeO/N55tsfH8DFvgnrGeOxd4tzYnPbIN3PGgHJAeVvhsVEkb3cWnuTLxTTEf+HHoi mtZIhU5efwC4u999QComw/YozG5lcrzr0W7d58wiLBy8tLE9AOhEf9s1vM9442AF8O3I VcE4INkUNizTx+eRDxw8JCki9EyZT2b5mGoe1X0fUT/1yb2L73mPgkxpDJsl5svwcTto LQHGvTUE0BX7WzxpMKlzKK1MSiu4ruFcCGpO0xhrcAGnFPKHzYnBIBd8d2QuZFIonusF GVj01aKTQe7xzAQmyBXaI8opm3CFB8PnKP7X1t24qdhcLi9Z0fpZD1mrpkN/blFqbzXt gwrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699896763; x=1700501563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7D/Is0q9/XY5O6mimvb47xPlpmUh6SE4PEHCKmELxsQ=; b=c2Zc7wjA891pom+1la/hnfqfbcbKmCzO3hxFqEmf3Z522bUjMJi5+cx26KwQUoo5wv ldJezHEacfroMfWUrOXC0IoDEdZrH4Hwz7YPJI7pJDuw6VN/ayf84aOwvo6FCPkAjaXt MrBg0qAxK7ZAMcCDm5Z0wbQWo3j8AjDCOqAG9dBVOWqjcMNvhBMbvsSYM3V0A3MFbgrr baKv5vC4OnfU1M7vP9cxCucP6wA4iUzgHK4zPhKDKvPE1AjEd97bJNx2556BbL/uB6xO j3D/ho5JjFvfXU7MMbJA8C1rYFjgnU0RrB0poUbC6UObX2rhA7/M+dlKEyalVZ2V52+f Wc/A== X-Gm-Message-State: AOJu0YznwmSjCrjVOA0O+kJgnBoWvQHafIGZkI/r0sezFxCnDrnFFHYQ s4az4iW45XcBdrbj0Tus8P7wvACCYTym+sy86Kw= X-Received: by 2002:a17:903:244a:b0:1b9:de75:d5bb with SMTP id l10-20020a170903244a00b001b9de75d5bbmr310494pls.7.1699896762924; Mon, 13 Nov 2023 09:32:42 -0800 (PST) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id e6-20020a170902d38600b001c731b62403sm4271910pld.218.2023.11.13.09.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 09:32:42 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller , Peter Maydell Subject: [PULL 05/12] target/hppa: Fix possible overflow in TLB size calculation Date: Mon, 13 Nov 2023 09:32:30 -0800 Message-Id: <20231113173237.48233-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113173237.48233-1-richard.henderson@linaro.org> References: <20231113173237.48233-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org From: Helge Deller Coverty found that the shift of TARGET_PAGE_SIZE (32-bit type) might overflow. Fix it by casting TARGET_PAGE_SIZE to a 64-bit type before doing the shift (CID 1523902 and CID 1523908). Reported-by: Peter Maydell Signed-off-by: Helge Deller Message-Id: Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index 858ce6ec7f..a13f200359 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -450,7 +450,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong r1, int mask_shift; mask_shift = 2 * (r1 & 0xf); - va_size = TARGET_PAGE_SIZE << mask_shift; + va_size = (uint64_t)TARGET_PAGE_SIZE << mask_shift; va_b &= -va_size; va_e = va_b + va_size - 1; @@ -505,7 +505,7 @@ static void ptlb_work(CPUState *cpu, run_on_cpu_data data) */ end = start & 0xf; start &= TARGET_PAGE_MASK; - end = TARGET_PAGE_SIZE << (2 * end); + end = (vaddr)TARGET_PAGE_SIZE << (2 * end); end = start + end - 1; hppa_flush_tlb_range(env, start, end);