From nobody Wed May 29 14:39:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VqBpl5yylz5MdBL; Wed, 29 May 2024 14:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqBpl50DQz4SGt; Wed, 29 May 2024 14:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716993551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l6z3VjUkNFz8QguAWSoz7omXZT/Je12/bZmymcs+pAw=; b=OUNbBZwP+0g29iCtPJPudTfkFrc6vFWIWx0rKlny5+BAOHYYesRliQgtW0BPQNUEePnYVv kbXGLP+iQX91JCTyyq9+ViI62OLJUBkwEBJojXZHzHgNKpvVk9vqWUzdGopRi5FkYdi+pZ J+wOEQBu8ZjaiKovva2G1ffHRDtZsHe+JRIXfZ++4edkQhGUch00UJjlZNOU79aPWt3Kmt JOYDLBN4S8iS1njnUBWA6RBruUd2XKfEo+7fibT9TAePh758RuVHJPqvRFge7SImm2yNrn wJQgFvs/Mm8Fi8ZayPOagkgDwMJAdv9WcCMXIa/l8ZFLkTee6sQyH7Dh05C34w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716993551; a=rsa-sha256; cv=none; b=ULmvZtIikG+NmmWcQQ2KjXKItAp6Q4MGTfxQfb4jF/2sf9DlBs1Ue9PZpqcln/ZaZR3Zd0 e8bu2Iy+w4z57kQylGGnjBDoHoIkD4oTZWJHWq3W8P9ls9rNMNEcWvvEHnMbZQO+kWksVk KwgJBJCeNQCduHMW0dy4YQsLxUqWBlTzrCkEcY1qEWlIHzuUgrJkty3r+FaHhjZ0Z+1XCo x0HkMuqmegX8ShDTrxKh48CUlIJYkGdZGQq4lr8sSTPN7IfEqxusKyMU/fEoa2xyMycg9r HOM93nSfJdokG5WJeQurEcVdnodyETCY8eTSamtIk4urK/c36tf4q/sUgnMq1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716993551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l6z3VjUkNFz8QguAWSoz7omXZT/Je12/bZmymcs+pAw=; b=MEuDX7D3HSOvkt46ZZsnNGuUUXf631p867FA5zLTb1ATD13fJ7YjsK1yecL3Rxti/IG5tT oZlZq9Kb/mKyc7OrS8cJAablR1LMT/JcxcEL9OM8szxFYWdx5Q3eQVsoXIGA295hMPtDps AvpYVj05iDjqrAlZSQZncicwyW9CUokzYKnpaR1EjqCLT7Fo3swCCiLDVGxyLAb8lvRoax 62jobteFX/0MpAM7Fz6jL9JwSiKVkJtYRXpUX7lP44kjJg5iauLJ64pOKFO3JKnzm92XGW GNtLy4KNniopeqOZPLBZK9NM/uCalXQtyB8TWIaqTUAcmavHZDjOOoMDBwk79Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VqBpl4bH5z113P; Wed, 29 May 2024 14:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TEdBXU097829; Wed, 29 May 2024 14:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TEdBI9097826; Wed, 29 May 2024 14:39:11 GMT (envelope-from git) Date: Wed, 29 May 2024 14:39:11 GMT Message-Id: <202405291439.44TEdBI9097826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5360d017be83 - main - loader: Fix G overflowing for G(4) on 32-bit builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5360d017be83d2502ba262f391ef45b07e0de680 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5360d017be83d2502ba262f391ef45b07e0de680 commit 5360d017be83d2502ba262f391ef45b07e0de680 Author: Ahmad Khalifa AuthorDate: 2024-05-29 14:30:59 +0000 Commit: Warner Losh CommitDate: 2024-05-29 14:37:17 +0000 loader: Fix G overflowing for G(4) on 32-bit builds Prevent G(4) and over from overflowing for 32-bit builds. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 --- stand/efi/loader/copy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 3f2d1c6c20b0..a0aea9823632 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -36,7 +36,7 @@ #include "loader_efi.h" #define M(x) ((x) * 1024 * 1024) -#define G(x) (1UL * (x) * 1024 * 1024 * 1024) +#define G(x) (1ULL * (x) * 1024 * 1024 * 1024) #if defined(__amd64__) #include