From nobody Wed Mar 26 01:29:03 2025 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 4ZMq280kvDz5s5vf; Wed, 26 Mar 2025 01:29:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMq274Pllz3rdT; Wed, 26 Mar 2025 01:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952543; 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=hZ8qSp2SNSa/ECD7eWd2g4yyXTLg+wysLK07F64nfVE=; b=krabOxYI0/l40eKF1SFejq0a5AM3mU2UCbQ19WgGYY+kqOYmeB7RkiEYUmLIsPn1z1V4Wv +9oJQef23N9e9ZIDVC/i9AfHPAw30XvLXitI7y1M/UAr62elbygoYLRExotype3XqiwJbW 2aEpP1UxKCSRYwtFHeyMyu9iUEPwVKf0+7IwIbIKKOLRWGreJHzkDQ3fG+qioVvrsuuE9j HXI/foh0c4uLjwbyN6Ym5ThP9Kfo69YoG+a+ob9zuZbrC2WAKHQ0W1Bh0PVTmPt4KtWHN4 4vt/OTyIM31aeoGNhif466PApywi+vyuMSWiDvv8M2k0NzLGlYRjpaXUIvIiig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742952543; a=rsa-sha256; cv=none; b=uTKcL7Bkxlhesd8PSc/7KvjnNc7J4znXzRUL9CUfq542FnEz2kkaeg0W+UvwLo88pVVT0s jQI3v9Fb2nMOhNrMv7lKovrYSEJQ57pLG+hxbt5IaRxm72ob0uBohJsXrwaKhR9IVToX33 3Hso6LNjVNXUn2rlvgAGERkdfufb39b4oKDshI1XnqSmgGTPcF8hwtAlpw4Hll5KSbA7/+ lOX1VPnTY7hmer9U+O/HuCm5nnjWs84FPMfqB6K6+oZHeOkGuweT2lzDp/Pan6BqN+H1TG RryB1Q/ZmeuPm5tJgfOABFhiV1mRByJp6AakI+gPOxNjHLy2qGAHV61pPkK/ow== 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=1742952543; 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=hZ8qSp2SNSa/ECD7eWd2g4yyXTLg+wysLK07F64nfVE=; b=tz04HboiRK1Sj6ZJmL/QFmw2NkjbwUisbIiAfya6pCbPIQinTl0CMOuiHcROKNXHFTtpAG qJ6WoGYC527is3Q6CbkHvUDAF7XGANYrRW2C+NtEv3/1/EqJT5ac+kMPdTtv7BPWoZ5DaW MGUsMeiRM8QulH0M6xvVykF6cH767hoqkwkXu4HyItnn5gcDW0UiGKVM7UwZWu8KvKiLvD L6SEshHnrR7ji02MBx9APtgLABx0mpA9Lf0zkU/aIM8/EpCJ245MN+yR5b1RSjTBodkB5f 1oy3auW8ZfejvTYw2p2MtB5M3DKPK4ciVz94twa+yPDF0SXTlTpuC8RtMw0bLw== 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 4ZMq273wxMz14p1; Wed, 26 Mar 2025 01:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52Q1T35d047385; Wed, 26 Mar 2025 01:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q1T3Y0047382; Wed, 26 Mar 2025 01:29:03 GMT (envelope-from git) Date: Wed, 26 Mar 2025 01:29:03 GMT Message-Id: <202503260129.52Q1T3Y0047382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 43dc900d75a6 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 43dc900d75a6262408f566dbaca27400ee5a9990 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43dc900d75a6262408f566dbaca27400ee5a9990 commit 43dc900d75a6262408f566dbaca27400ee5a9990 Author: Ahmad Khalifa AuthorDate: 2024-05-29 14:30:59 +0000 Commit: Warner Losh CommitDate: 2025-03-26 01:28:38 +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 (cherry picked from commit 5360d017be83d2502ba262f391ef45b07e0de680) --- 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 b6dd7c51c921..d34acea4e876 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