From nobody Mon Nov 09 16:04:23 2026 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 4jNZNR50q5z7027J for ; Mon, 09 Nov 2026 16:04:23 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNZNR3dPpz4d52 for ; Mon, 09 Nov 2026 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794240263; 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=pFk3pxc48oHqfIsFjfEmUlPrqD8MKacFT4k1zAa3DdA=; b=rMqYbgrgYWmqnKl6hZbwvi5SLum72s3bUUMUfFOkGmIPWsZ+1KQP0k+ccWBqqdQMHtfTZ2 80kM4pZrdf96Ed9wi465sayCmOQwv8QDmDuGF3jBUZnyJHnc0zePZ/kyzbQ/LHQt1gKkxZ DfeScXMkr0+wAnWZKEC9CSbGp+5V2wdYatkYSWQJBic8tRPntI4tFDX8EYcLTzszIV1sWF Jv5kRnpQl/l1ovfdhOxZ0jhCyhVQ1l3HKt6NtrHbBuSKwOywWl6OBDTipMy2apN/0r9Xlg 5YFmEeAb26SZHAPTbSDD0vxtd8FpXx9nGQhCeBUIxI3ALE1Gqh1d8fRnGljSKw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794240263; b=WC3aYx5P4y4vCRRO6MDU+YL4fQ1Cbr+c6Y/XzgEBMvnK0x3UlYojElDTThdqULP38JE6Y0 XvmHcJ8zzfvBNQ5Sf5Ook/TL1wZb/UY62EOkA10XolMUDsOomd7KcwEg7nhoB/n2iAfX/l hmEIN0roas6RNM4ymj7+x9n/KCZZVUtNxuKJ2P+dv3aoGqfiR1fSOgc7+ePE5EfsGVDTXq yE8aOa/4+C8+PNaYj/Ux4rK0pyhZ3/otL2YP37CowmZyw/bgoejIdZXd8gzcT9+p9fGmdJ l2Lyj0RQqyBWG5XOYmLZ6zlSa2koXoDwV1k+Hw/aUay7YKkSl1B13D0CzoXPeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794240263; 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=pFk3pxc48oHqfIsFjfEmUlPrqD8MKacFT4k1zAa3DdA=; b=ubQS41ur7RyrOAS52nx5jRNEEIFSTnuDMjfqUEhcC/5NKmmGb77OYde3171HHaoLi4qhDf v9qcKpNm1bMUkAdBQQDlhd0rDHFT6cwzbVliu6CL/VJXKQIsEn034rgCC18QmrHipAW0Gf /LX/LrkdkLFN3dQlIEORjlFELkIZkT8TFJyqCeL7te9k9oOB+xZP5TrGE+t9Azf7v5j/ci GeAPgb63ZKQgTOIqGhXZfTE7xvz0yGXlGtxqP5aVTiSUEPK2GKxXK80DZlyMDK83Fhro5n 4EVR9n/A1da1Z/lg4EYJxBVrEuCTHAQY9Tldw8ZunDwH/rVciqqylUKco4TxpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNZNR2RRBzp6p for ; Mon, 09 Nov 2026 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22829 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 16:04:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 74ec4ca76b97 - main - mlock_test: use mmap/munmap for unmapped pointer List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 74ec4ca76b970f80fe7a7c123c1f0ea628e6712c Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 16:04:23 +0000 Message-Id: <6af1ef07.22829.6c05a325@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=74ec4ca76b970f80fe7a7c123c1f0ea628e6712c commit 74ec4ca76b970f80fe7a7c123c1f0ea628e6712c Author: Brooks Davis AuthorDate: 2026-11-09 16:02:55 +0000 Commit: Brooks Davis CommitDate: 2026-11-09 16:04:16 +0000 mlock_test: use mmap/munmap for unmapped pointer Instead of hoping that the page after sbrk(0) is unmapped, map a page with mmap and then munmap it. This won't work with CheriABI and heap temporal safety, but it's an easy fix for now and works on all architectures. Reviewed by: ngie Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D46954 --- contrib/netbsd-tests/lib/libc/sys/t_mlock.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c index b081c60bbecc..eee29a21f655 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_mlock.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_mlock.c @@ -46,15 +46,6 @@ __RCSID("$NetBSD: t_mlock.c,v 1.6 2016/08/09 12:02:44 kre Exp $"); #include #include -/* - * sbrk is obsolete, and libc only provides it on a subset of - * architectures. - */ -#if defined(__amd64__) || defined(__arm__) || defined(__i386__) || \ - defined(__powerpc__) -#define HAVE_SBRK -#endif - #ifdef __FreeBSD__ #include #define _KMEMUSER @@ -112,9 +103,7 @@ ATF_TC_BODY(mlock_err, tc) unsigned long vmin = 0; size_t len = sizeof(vmin); #endif -#ifdef HAVE_SBRK void *invalid_ptr; -#endif void *buf; #ifdef __FreeBSD__ @@ -168,12 +157,14 @@ ATF_TC_BODY(mlock_err, tc) #endif (void)free(buf); -#ifdef HAVE_SBRK /* - * Try to create a pointer to an unmapped page - first after current - * brk will likely do. + * Try to create a pointer to an unmapped page - mmap and then + * munmap a page. */ - invalid_ptr = (void*)(((uintptr_t)sbrk(0)+page) & ~(page-1)); + invalid_ptr = mmap(NULL, page, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); + ATF_REQUIRE(invalid_ptr != MAP_FAILED); + ATF_REQUIRE(munmap(invalid_ptr, page) == 0); printf("testing with (hopefully) invalid pointer %p\n", invalid_ptr); errno = 0; @@ -181,7 +172,6 @@ ATF_TC_BODY(mlock_err, tc) errno = 0; ATF_REQUIRE_ERRNO(ENOMEM, munlock(invalid_ptr, page) == -1); -#endif } #ifdef __FreeBSD__