From nobody Wed Oct 22 20:15:23 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 4csL4r0ktVz6DHqB; Wed, 22 Oct 2025 20:15:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csL4q73KKz4JGd; Wed, 22 Oct 2025 20:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164124; 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=jQUTV0LrKU4MYq3gBp4GEN/oJWfaLUIVG9TLqbQAWuQ=; b=DRk/8ZQ4fZV2PPLljLhbNoMmPi4IrsbxowgU6dq1QKKtwzCXUXZrA7/l2LUziy7Ha2IS8h kTV2kBjFIcywCoRwsvSdHu+tJzWHr0zMkI7CBrmmGQNMzfFlbk4HHbRW1KfpPBUOelOCHe L8TW4R4RZtlMXEJ/2stgoy+jVtDtGr4AYuIrzxxwXe3qs9N9MxQ/W1y0G9eTv+es1fNXLP gGX45iHM92MscjRZENtPa+qopwjXLO3QqEfwJU+Qfr+CsrcmZjYrcXZ91gpEb5HvGPD8xp sl0dX6/sAUSwtMmxJlt8wXoczHe8dPqJU2ehSsEMLCVZB8et9d1LY2iOrj2IWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164124; 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=jQUTV0LrKU4MYq3gBp4GEN/oJWfaLUIVG9TLqbQAWuQ=; b=Fs7aIyLZ824PNQ4l9oGSfWUV/L39peqnbjqnu0b2MHNG3Kx1F/gapxItxUW51Ly00jKGVV yI/KePkAI+By/1RoWmbTwVZtt919SzdxefsNBvXcR9HtpBKL37eJSIhRylBlwt0XpuBSud a3qFmVx8uLxwH8H3bHiR6Ofqi6Bbr/CxRlGrwWbkLlELUxcMcVKOYU+G3Cb+FDAWPfF/F1 O+4pMTxnFfjUWhpCDGrsmmZqa7Z7maFuX6oT+WmwEDcPk2NWalIQvMPSZhm0zEb7dG3Q/q 5PqPIpVK9o3ynMyy4HtbbFUlBx3+MuYUi+5kc2Y3tzbG6mz3gZlUyJmCYVEZyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164124; a=rsa-sha256; cv=none; b=fJoA5EXw3qyL++ew/jKRB9/55PNU5yNJ23hMNp5/WtLy1aCVPb+ce4KQGKO3e/UGnpSobD E16FWJLsvJhgwGtznbRBFZppkceAW+37RBFzKFHgSE6YQLjqptTvYyZlSLiozILuFktilU 1kTQ998KILEEKpOeKVXQYtlHB6WsUtBjHAkXHV3G9b+ubvjWNRvVf2lzv6jQEQPNiMvBlS c4bPppzTPOYSCdiXuoqCcBm7gla3ctuRwv70t7SNqkXpesCdQrcw2S4CimJzcV2+Y+a60t BMrpsADK2oWITFEWoXaFevdkcdslqxbEmTPRQQPNpt5gEkkyhd7WTtrOvHswDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4csL4q6ZH1zl48; Wed, 22 Oct 2025 20:15:23 +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 59MKFNX6033015; Wed, 22 Oct 2025 20:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFNgK033012; Wed, 22 Oct 2025 20:15:23 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:23 GMT Message-Id: <202510222015.59MKFNgK033012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 945500c6ddc5 - releng/15.0 - exec: Check for errors when mapping the shared object 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 945500c6ddc5f670c76e9fe390d8919c897fa8de Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=945500c6ddc5f670c76e9fe390d8919c897fa8de commit 945500c6ddc5f670c76e9fe390d8919c897fa8de Author: Mark Johnston AuthorDate: 2025-10-14 13:33:33 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:18 +0000 exec: Check for errors when mapping the shared object In the non-ASLR case, there is no check for an error from vm_map_fixed(). Restore it, it was dropped in commit 939f0b6323e0a. This bug could result in a refcount leak of the object used to map the VDSO page. Approved by: re (cperciva) Reviewed by: kib Reported by: Ilja Van Sprundel MFC after: 1 week Fixes: 939f0b6323e0 ("Implement shared page address randomization") Differential Revision: https://reviews.freebsd.org/D53065 (cherry picked from commit 7117c86fcb7ebee4483097cefa9b143de8d78ee0) (cherry picked from commit 6a5f0dc705c4401454d4fcd61e7301b992bfea13) --- sys/kern/kern_exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 0fc2d0e7f1bc..b2c09b47f103 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1314,7 +1314,7 @@ exec_map_stack(struct image_params *imgp) MAP_INHERIT_SHARE | MAP_ACC_NO_CHARGE); } else { sharedpage_addr = sv->sv_shared_page_base; - vm_map_fixed(map, obj, 0, + error = vm_map_fixed(map, obj, 0, sharedpage_addr, sv->sv_shared_page_len, VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_READ | VM_PROT_EXECUTE,