From nobody Sat Jul 13 19:49:35 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 4WLzZ76gf9z5R1VR; Sat, 13 Jul 2024 19:49:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLzZ768xFz428g; Sat, 13 Jul 2024 19:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720900175; 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=IyzedditnouSEDptC8Ly9x9bT9QCPme9emRUIeogtCg=; b=AeZdu/ONPc5bOB2i0zG1MX7w99YzcNKFajHFHtnaPH2qXfOf7ElD7FA0WyVv5eSqLEafc2 QEyyWjjzEjBufniT5KBjnjBewDDj39y+hUSHgH/lnidZB6fvmDHz5UsAzAEYpuIO8uZNyv 6EYzP7CQ/Okz1HuTsxdTrG4Igd7d8mDqpJj2zKCGA74JpC0Im/hhlVLAWn6qo+IIxFmrhr VdxIN9q1LTP2BZbz6WSu3D/IIrVGZju8hB8eOyCye24hNvTNpvEqWx2s+IoR0YJ2BR+odu WgzQ917xXoMH7HLbdroOo+pVkVQ4WmJmGOLnduKLMWutYxOZ1ce+N0SYUn24zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720900175; a=rsa-sha256; cv=none; b=vKx8GlPBu2313KpZHpWZ4VuyT5Acaji8j6qQ1/lN2LOlSoZgPlIGwFItJoSfQ6j2X1yLez PeMshG/PFIrFv3YQc4FpjJQIfsE+TrkC35pI17kChxDwhLyogJ72RFgd/Slvte8r9nuOG0 8KPGm07yjjYxrlkn7QI9UkHWvh5uKRQ1KjHrp98Ygzj6SG5ACm3ByNZffX9PTwGslY5HdW StS2/UlmieNONUtO3hYcRPtPhvj5zypgmyQTkSvHhtYKOfyTCwP9F03g13uBOkayLVJJjc i8G2c1fCQBppfvYtclSRIWvBLWqZpGq9HXwRZa5my4raN5e/uje/ArnEgkW8OA== 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=1720900175; 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=IyzedditnouSEDptC8Ly9x9bT9QCPme9emRUIeogtCg=; b=ZOIsDmxxDDhly+Ex4lQ6+RcBXS7l/D9u8rGhe0zsG/K4uVmUGWZgNyBq+ItX3c+NEnjwEK 4H2ZnCz1ngSGNPTlI2JRQvDQfuKbHLJ4MBdBMPcKJTtafBFC7PVPmP1W4LKfrOG6Pq4Opp mc6qZpaJYIgPzHN261cKhV/wOy56LIo/hXDMjI2+gvmNamtnD30Sg3efq61JBLNx5mfzoN lwInB8CRKLg0/P6nj39MRNmRYzimyzmOV32OHCA3eBxh4UskDpCOEsBF+CmOcbvkPrlD6x i/lAyKwQ2VjzP0MFtnZcFksIl5G9ipyzwbLrP52eaOcBtZfdSKsSsvnBckQMHg== 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 4WLzZ75lDbzg2Y; Sat, 13 Jul 2024 19:49:35 +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 46DJnZFP094135; Sat, 13 Jul 2024 19:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46DJnZiE094132; Sat, 13 Jul 2024 19:49:35 GMT (envelope-from git) Date: Sat, 13 Jul 2024 19:49:35 GMT Message-Id: <202407131949.46DJnZiE094132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 772ae9eddf87 - main - vm ASLR: Handle VM_NRESERV_LEVEL == 0 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 772ae9eddf87d835279ea6aaaf08b8ca421101ff Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=772ae9eddf87d835279ea6aaaf08b8ca421101ff commit 772ae9eddf87d835279ea6aaaf08b8ca421101ff Author: Alan Cox AuthorDate: 2024-07-13 19:40:43 +0000 Commit: Alan Cox CommitDate: 2024-07-13 19:40:43 +0000 vm ASLR: Handle VM_NRESERV_LEVEL == 0 Some flavors of powerpc don't enable superpage reservations. Fixes: 3e00c11a4f43 ("arm64: Support the L3 ATTR_CONTIGUOUS page ...") --- sys/vm/vm_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index b9c27e14d1d0..77297a0e3957 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1993,7 +1993,7 @@ out: return (result); } -#if VM_NRESERVLEVEL == 1 +#if VM_NRESERVLEVEL <= 1 static const int aslr_pages_rnd_64[2] = {0x1000, 0x10}; static const int aslr_pages_rnd_32[2] = {0x100, 0x4}; #elif VM_NRESERVLEVEL == 2