From nobody Mon Apr 04 11:06:10 2022 X-Original-To: dev-commits-src-branches@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 418BD1A976E5; Mon, 4 Apr 2022 11:06:13 +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 4KX7Hl2dR2z3Nht; Mon, 4 Apr 2022 11:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070371; 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=MjjAOvo8PWmmZ7EekHkkoE0bSoiKRWc42lnq+yK76kw=; b=f5yknUslwCbgVmduHXWfN1cPTIoqSsLR16OhHglfgvZEgxOoTR4BwqKmOVSlrGRjIDlBMo cDL4BIi3MzaBmEOzC82WmQPn2CX2nAVYz1rBMtI6OBuS+Z/nh8WydRWgw5W8FxTIwtgHE/ HrzxTRyPPZUPha5UiAj+TxuIqqJtjBZGhlMDOx2EGrVh/+vkZ/euH0pqVlvwj5Tzaxx6t5 PPkcepbDXPvK1Q2TN9nK+TNGAQ9wIMmvHgUOI2wWetyE+3YXKTPsqFRLJa4dq28ulk2lFi LoenVuE7gHz/dnCd+qXESLsSQUV+isHUiBSpAcHWQlwyIXVqlM54AHFTTwziXg== 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 979AB1066E; Mon, 4 Apr 2022 11:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 234B6Ahf086726; Mon, 4 Apr 2022 11:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B6A8v086725; Mon, 4 Apr 2022 11:06:10 GMT (envelope-from git) Date: Mon, 4 Apr 2022 11:06:10 GMT Message-Id: <202204041106.234B6A8v086725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 51281d53e784 - stable/13 - Make SHMMAXPGS an unsigned long List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51281d53e7849b0adde114e12e91d10c190f3149 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070371; 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=MjjAOvo8PWmmZ7EekHkkoE0bSoiKRWc42lnq+yK76kw=; b=l2CersPVhoGzw90Yk6zuoPjTZ26uQnIO+MQq16jB40FMxkUoCuJ+5qhPYtQppojITOfREJ 5WMO8WwkNFv9bHArU3IIDzl+zXXD521jLFxjKXXIFY7KsEBAs4fSp9PFbDJYwYF3+OeEAv WoN9bhrohYLQbJGcgdSUjWO3C8te0JkvN5OfUUm7x7VOkbPnjOsBeMc2/esQjtCgSLFXbb kP6ojWOYGbl/XAOWAgCxM4DhZOuX/7Dk9yH+uwqr2YXseOe+ilho0mrklwaa4iuMwrZmsg 6Cc4naKUvwAhq3m88FMADY2z8r2ydaDcTkYJG7fiLdkgXjuC5q1aKf/CZXFXnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070371; a=rsa-sha256; cv=none; b=WQ+rSAtKqDcU+ViilzEbwgoQlqtzgO0WMdyWLbiX3kmLt2oHkSr9q5AD1/aeAoew+6C6Nv 41qg97Lb1BuHbEfpZOGm6WgWNgXZ7J70OL5HJdydwfP/k3L+d3AoxpkCD1END+AFot/Nk1 ZYsCHrOPy7tU0p5D9IqMKsGl1K06sNi6QKJ+wOQtOECB3RI2EBww6zwjLKgVvfG5bI15eW dnqanM/op/8RtWsD/Gscd6kX+v4oLLU41h6EYDhGGAhvPWVaCPKteMXWZdLd6KG3xqhhOS yUTlb2kW2mHdzI/V4No9Fy4pD9zgedBtyj049lxO1M+LEmp2sC9tlaVi1Pgz5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=51281d53e7849b0adde114e12e91d10c190f3149 commit 51281d53e7849b0adde114e12e91d10c190f3149 Author: Andrew Turner AuthorDate: 2022-03-15 17:42:30 +0000 Commit: Andrew Turner CommitDate: 2022-04-04 09:37:07 +0000 Make SHMMAXPGS an unsigned long This is used to calculate sizes that are then stored in unsigned long fields. Make this unsigned long so the calculations use this type and not an int that can lead to an integer overflow with a large PAGE_SIZE. This allows building this on arm64 with PAGE_SIZE of 16k. Further work will be needed if a 32-bit architecture tries to use a similar sized page. Sponsored by: The FreeBSD Foundation (cherry picked from commit cab496e16cb384de03010d9dea7399cbbfb3c3f9) --- sys/kern/sysv_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 2e7ae927dcc3..e1d6fda7e2a3 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -155,7 +155,7 @@ static void shm_prison_cleanup(struct prison *); * Tuneable values. */ #ifndef SHMMAXPGS -#define SHMMAXPGS 131072 /* Note: sysv shared memory is swap backed. */ +#define SHMMAXPGS 131072ul /* Note: sysv shared memory is swap backed. */ #endif #ifndef SHMMAX #define SHMMAX (SHMMAXPGS*PAGE_SIZE)