From nobody Mon Aug 11 11:19:29 2025 X-Original-To: dev-commits-src-main@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 4c0sbj5gyJz63M1R; Mon, 11 Aug 2025 11:19:29 +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 4c0sbj4Zbcz42pP; Mon, 11 Aug 2025 11:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754911169; 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=xBVB+ESMF6s7dfT0aJA1BH8ZjCsaliqaeXMgcQtWwsw=; b=ZYPZmBiyTWRo7w8q2nOTOOEcA9oRvATMCuHHwPcPUzy1lys0qtryiZEXhJQIExexdDuVT5 FmWANVR9s7zP/r8FW9jvwCgQqO/nzXvfgA4m87lAPvxjImk3FKfCvdNNtjdBks+JNdSlbx uQgfMtRD8EbnqZ1uYkV5875xA+RzLRVsk6Fpg3SiOMVKOjKDsAJd0goDD/xtUAsHUOrmj5 uW84vtW4z8cmqZ6c/IiThhv9niJP/nsF64GnR4DLnRU5wCX7QM4Cv2D5F+vp5niLWLLTi/ 7dTsKHynozEZC5KzOBLs0Fu/i0sYQcCjghhky8J2HZwKwNZd2znam/cicRVqHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754911169; 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=xBVB+ESMF6s7dfT0aJA1BH8ZjCsaliqaeXMgcQtWwsw=; b=URVj+lFZXzlbyEKfHqvPIDzp6YCkCPNNBt2R7xIvtymq/AaDVUNYnr2tTL9k8vERygMX2e Pi3IANF+TJtIyX1fhRoK/Vh9oS0oWtp1sl2MT2R7kbE2vjfMvXZHeSD5dy2uYEneXFcPXF /XCrT6gnhjF/wADJChs6AQYoP5PRinzuZ+ZJmrtD0S8/qGU+/t98QubspPOlUIPUonLayC XVDObOxbYZtLum4GGDB3ani15rv1y5M6z6j5nCRlhuzQJixV7/gpb92nzwZ5YBnhRvgu78 oraSQkpYQsqpX0c/yN5UuQ5Yu6YwbL2sUY+MoYx50A94uhqFx5GfieejQwkWCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754911169; a=rsa-sha256; cv=none; b=pQyo7Zhz9BP4Z87tiRTmHLQalDL+bFDIiteQuhX9UQztCNQ5OjYNCTwM2IrZb7VStk6Zah pCNI/H//cPMHWdQ/3fQiNF5oL/bXTpzD1pNujtwTdfFqdUrOu6DoLBd3VEQxlfp8CvFa8m pOeDN1u7Yqwfq2wf0fjRj+y9HHn60Y/zFxlXMzleqTVr7rueoWicKpZGMXZfku0SFqJ5cM 9VwQMR5XVBvy9hBo8j5J7iUvSORjeGVkD6t4ZNalaNH2FV8l9zI7540VGsv9VyPblghSpx UuyLr23hE/onf1eCMy1ktixuo8oFNKo90Y0vGppSPIHeishzXlPYKdnMhExkQQ== 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 4c0sbj3rkmzpwd; Mon, 11 Aug 2025 11:19:29 +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 57BBJTL4089784; Mon, 11 Aug 2025 11:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57BBJTMN089781; Mon, 11 Aug 2025 11:19:29 GMT (envelope-from git) Date: Mon, 11 Aug 2025 11:19:29 GMT Message-Id: <202508111119.57BBJTMN089781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0f434b2b5060 - main - rtld: require MAP_GUARD support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f434b2b5060b9898229a1b33a10d06616119257 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0f434b2b5060b9898229a1b33a10d06616119257 commit 0f434b2b5060b9898229a1b33a10d06616119257 Author: Brooks Davis AuthorDate: 2025-08-11 11:16:40 +0000 Commit: Brooks Davis CommitDate: 2025-08-11 11:18:51 +0000 rtld: require MAP_GUARD support MAP_GUARD was added prior to 12.0. We don't support such old kernels in userspace so drop the support. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50731 --- libexec/rtld-elf/map_object.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index c6a98b50a165..5e5774c0b017 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define _WANT_P_OSREL #include #include #include @@ -43,8 +42,6 @@ static Elf_Ehdr *get_elf_header(int, const char *, const struct stat *, Elf_Phdr **phdr); static int convert_flags(int); /* Elf flags -> mmap flags */ -int __getosreldate(void); - static bool phdr_in_zero_page(const Elf_Ehdr *hdr) { @@ -204,8 +201,7 @@ map_object(int fd, const char *path, const struct stat *sb, bool ismain) segs[nsegs]->p_memsz); mapsize = base_vlimit - base_vaddr; base_addr = (caddr_t)base_vaddr; - base_flags = __getosreldate() >= P_OSREL_MAP_GUARD ? - MAP_GUARD : MAP_PRIVATE | MAP_ANON | MAP_NOCORE; + base_flags = MAP_GUARD; if (npagesizes > 1 && rtld_round_page(segs[0]->p_filesz) >= pagesizes[1]) base_flags |= MAP_ALIGNED_SUPER;