Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp999491rdb; Fri, 2 Feb 2024 10:09:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGODACT4XG5TEYZT70owUiw5vKIbIpEA68jmGMoszQk6Vv1M7JnTZ8uYL0qXStSpcD2eCew X-Received: by 2002:aa7:8c01:0:b0:6db:d2b2:24ee with SMTP id c1-20020aa78c01000000b006dbd2b224eemr3080365pfd.30.1706897383288; Fri, 02 Feb 2024 10:09:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706897383; cv=pass; d=google.com; s=arc-20160816; b=Mf+AKhrXSUtgegz3a5hWhcg3kcZAEP63W+qtI/nZnQ+fkNQk9EK+9XfV+cGHBcIHXQ v2L/Kv9S/s+OF9gyMkscGrX8wZfY4BsIHOBKFl68nqwFNEBhtU50HbeltqpYn2yWfMLx BngEb3T9wN1lcIps0yruyJC0NvH7D/l8A08kfL5flN29Uy2mwejP0sXf/2CYw/VU+cOJ GW9MpMFiFE4/18XbcuzxUF+5KqyKN5KGLnOdMrrw5rZvgEzlwdAnEsSfctxOpWNoscQI Nfd6imkB7DXCBFprS+jykputVA64ZEFlWxKSe2YohfIreeqQ8ATETYPB0JFdVb7/uRgc jdRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=9Yyrip3T2gRBwGLvYCLpLjUFISir/avz/b+c2luLHGY=; fh=FaocOhPnsTXcdOg6NwBAmvsokx4USQVTwQwjJRoEO6c=; b=nBDLmHQkhx5LIQIG/ZVEtsAgaCxNSXZrIHC8uTWAKke2gKf03p3fMq7FqHCoQhN8Vf +JdlfXamyXuVvYPLF1gXMu5shz5a7yAf8SNJPxioTgsofLaNX1zHQCqqzS5JR5qINHRY U/A74U28lfjbapm+zP0fNSih0TSCD/uAOIyq+ROUuIbcR2tK30V2xVDd7fzGk3vlMz2a GScI5Z/nThqUsougJQA7QvH0DU8RvulBf9J4zyWQgN4PrkasPLdpGANSy5jD/rRMWHr+ FmY+V/dXOcuH/y/2mbQ5LpT80HuMbuQW5Yvi3GVLPS18QmsX6K/oCILfgoFfzNyg6SIe /2Zg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=H62nDHHG; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-50294-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-50294-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCW5yyHCTUn/ZkDHTdpLC1BqD3Iv2xTq48ODi4TKciXYh77OiWGIHft6QD9zhQifrMmCR1YQK8zCpq+nK56+mdQds/ruE2yw4wBHTBeOyg== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z15-20020aa7888f000000b006de3d902fe1si1900069pfe.372.2024.02.02.10.09.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 10:09:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-50294-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=H62nDHHG; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-50294-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-50294-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 599BB287570 for ; Fri, 2 Feb 2024 18:07:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3AB5714D441; Fri, 2 Feb 2024 18:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="H62nDHHG" Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 010C514C5AF for ; Fri, 2 Feb 2024 18:07:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706897235; cv=none; b=cA/cYTJAtz4ahXP8ry35HXIOK3gVuHxVNlgGQySqiOaD7JbaORU+mMWDXLN/RDZGkVomYhcfpbLXFleVk5gY65ZAwvfujPPcEpx4CwDQyITPFVzP7sUMHe+rxKsgxMr0Bqx66TUYyWXZ1ZO4ELriJtRipt/a7sFz5Ijl+/u/GEg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706897235; c=relaxed/simple; bh=WyNQGE65iXrMr9yngCo4GWOgGd/sXGPgehCp3iXlLL4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lAvrSddEmPrsjNv+a6mhoEkIi7FvLs6KPac9p5f+ykcY61QCCfKSy8zKKpMU4XIuotZToQys9IChL1mT9HBzJwf//mwzpBVUbyrzxRyxCnOn5XRo2JNrc3M/oxAkOAulplkNR1FrWfyDL/YXxvXsc4MzklNP1N7bbdVioJzA01o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=H62nDHHG; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6d9f94b9186so1878244b3a.0 for ; Fri, 02 Feb 2024 10:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706897233; x=1707502033; darn=vger.kernel.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=9Yyrip3T2gRBwGLvYCLpLjUFISir/avz/b+c2luLHGY=; b=H62nDHHGZYda9okCf2JfKZCp+55LjIpMigZ5Y5jAtyqGH9J1UzEB356D3pdmoyujqj x/0Krd6MFnGDgwUhTpgOujbbhdnw7AMR5nmplvXz9vmkO+/PHVqUdswaMm0R5Lmq4OOD r9wGLBVANxD8YP7S6XMIWtTTKVvrOiUjD1Xxo/qaN/k8CUHIZOcwVgMJfk3Nv2+jTX5y w7D34t2HgHPv81SjoaW58JJ3PjZL6v/ELD2sFFLIR6rrbK5o1397KBCDrX2Eiu2AfM3X 94fyHHWuDlGxfXtFG/aL4LpY67jD+Fe2Lztx8kYLULlNFKK/TsKfEuCiQLNJDWF7b5ze d6wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706897233; x=1707502033; 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=9Yyrip3T2gRBwGLvYCLpLjUFISir/avz/b+c2luLHGY=; b=RGLK0gTgpgxkng1al8STMQr0R/husjlP3bYPZilUfh0VBCfYC5Qa41St+ImKUqhpDv jL6Kz6rJl3eHAg0/pV/zKsLY47bNq5J3ZAQH3L1pPi7OCw+qdDkOIr2HD4STAwzKYxIu SxdiA/Ntz/3EguP06HQ1aOuWJOW3DyNfKMUVWz628bidpwEHTCqV4yw93TTVw0EAuHgh iLt6UHYiTkILemFy1Imb/MiZlEvYtCy8jlpkJ6L2a15PRmoGW7NVDXIXKYeA2m401zV9 ObeaGAbeQ66TB2hsjYFZW7KKQ4M7r10My6sz6YinYjsKluM96dh7dsCWnhZJzAcWaJ4p AymQ== X-Gm-Message-State: AOJu0YwwhRXrZnKh+DI9jKh7FV4PbkHYIU3Hg+GJL5EChYg+c8WDcwJZ ZMtQvAIxeMXnyx5n3th7BALmZUEwXYUF/vXzlKglPDCqGgRKjyRoIsqMOON2gYY= X-Received: by 2002:aa7:9e11:0:b0:6ce:751b:81d9 with SMTP id y17-20020aa79e11000000b006ce751b81d9mr3346175pfq.9.1706897233322; Fri, 02 Feb 2024 10:07:13 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCU5uQRhhNr4F5Tr/eDx4VZKGJkZm2fFKhzvmErVJFdhN1keJw/2/IIbPia/PAaM3mkVII16Nt5yvabl0M3Zh8DUWKa04jN+PvoVj8IbhmJzrBJJb9Arr0kaYy98U+F3QdLE5FXpj6PMaQqSExRB9qZR4DdEU4G0klU6A2Yo5YCioE6HI4Uq69jHHuQmm1KAoMudrIvnpqJDFjQ+aG90RJGeKLQrNFSBnP1dKqm3fulhCWqUkrdAXfbWK+vNySD4eg8DV/zQ0+5yqh++ Received: from abrestic.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id s26-20020aa78d5a000000b006ddd31a701esm1989267pfe.19.2024.02.02.10.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 10:07:12 -0800 (PST) From: Andrew Bresticker To: Ard Biesheuvel Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Andrew Bresticker Subject: [PATCH v2 1/2] efi: runtime: Fix potential overflow of soft-reserved region size Date: Fri, 2 Feb 2024 10:07:03 -0800 Message-Id: <20240202180704.808766-2-abrestic@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202180704.808766-1-abrestic@rivosinc.com> References: <20240202180704.808766-1-abrestic@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit md_size will have been narrowed if we have >= 4GB worth of pages in a soft-reserved region. Signed-off-by: Andrew Bresticker --- v2: use u64 instead of unsigned long --- drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/riscv-runtime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 83f5bb57fa4c..83092d93f36a 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void) efi_memory_desc_t *md; for_each_efi_memory_desc(md) { - int md_size = md->num_pages << EFI_PAGE_SHIFT; + u64 md_size = md->num_pages << EFI_PAGE_SHIFT; struct resource *res; if (!(md->attribute & EFI_MEMORY_SP)) diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c index 09525fb5c240..01f0f90ea418 100644 --- a/drivers/firmware/efi/riscv-runtime.c +++ b/drivers/firmware/efi/riscv-runtime.c @@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void) efi_memory_desc_t *md; for_each_efi_memory_desc(md) { - int md_size = md->num_pages << EFI_PAGE_SHIFT; + u64 md_size = md->num_pages << EFI_PAGE_SHIFT; struct resource *res; if (!(md->attribute & EFI_MEMORY_SP)) -- 2.34.1