From nobody Wed Oct 22 12:52:36 2025 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 4cs8Fw4dlFz6FDpc; Wed, 22 Oct 2025 12:52:36 +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 4cs8Fw452Dz3mfl; Wed, 22 Oct 2025 12:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137556; 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=x9hdKUQFdFS1dBlVj1Oti5redms8qxaX93qXGLRI90M=; b=iLWQUWPE0ROAIwu1j33Kr1Mvdzyz8nCDp8Sf1ULqCmgYZQ7KPRSnH7uZg0sKavxT1M+am7 c5fxAIc89bKwShbU/4/zbSLlW/XUFpgurtbKP7lfDKF4eNsIBKxvhdPRmzYJpYDjtWXmBP nJ70kMhp8Q//lBBXbRWdeqxF1JzuWlz38fH5iRNTKmiVdbgEHe5K9wtG5wKJiuvAIZT8Rc kZxCtjKbjK5mGb6n7kM8pfOCJ8lATG7tvumCCQjifOuFCTW5qoxjN08lV4jbfwD7z1lbaI LDA00yiBlo783rnZ7QfEGirgJ42HUmn3F747AvxoMOcajuBiEhujFB5ucZEk6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137556; 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=x9hdKUQFdFS1dBlVj1Oti5redms8qxaX93qXGLRI90M=; b=UflIEL/dyyvyChkbM8/DHoEAKYl3Kmh/cBcgrXFiy1+CYs+lmk/BV6SdkhTFuomUDGh6U7 r0vyRMoqCMS91ERpz2lSOfw+HaM4ooVzCjDsTidMGYVZ5DqEBt0vAqGwCuWogHx55TKNzt 8VX35LxPA8iH7TUoJdbNrk6XPqkP5U543QvRvWan/E7uWyHyKIBjPI+FXwPPLqb+Z3r3vA 5bq7yJrJy0yF5+YJDjeGWk4Xng1K0KRERCuvqEWFA4EoQpLDV9PjVe3qnKQ2g2uhIgxbaX 5uJGCu6PveJ79gH/9VfGmbP5gYy1Zq8DAiLdfZ5ReU7kVSj6kyHmlrN8Io6xYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137556; a=rsa-sha256; cv=none; b=ROENQUTlu0jbE+uwiEPgUsvFq86x4usFvIr8K+ol0SOYIktVWXOxypEYPeOlR1wgQcvzgI AXS6V3vXTK/fs5LPcQUozB0y17w7iMV7PRiE6qf2T+5nuuEGf4+QnXpSupk95+wpYBgH9/ eUCs1/5f7Xal18FCnP8VXnY2ibBWSATGPs6fKFk6iJrja9u3RoqKv6oJKSihymb5fh4try 5Z37d28A/8+lEimD2rqaXajLNmbx93LYlcHL1tYjf3HWZ4Aat4W5jHz7MTWI3564k1BD3J 4/Zw/RUrVQr2nT4SmmkUyh0vA88vI1NLdVI2lKD4ev4aAbFR9A/AJfaNqEgT6Q== 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 4cs8Fw3R1rzTkc; Wed, 22 Oct 2025 12:52:36 +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 59MCqa7k096102; Wed, 22 Oct 2025 12:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqak8096099; Wed, 22 Oct 2025 12:52:36 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:36 GMT Message-Id: <202510221252.59MCqak8096099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6a5f0dc705c4 - stable/15 - exec: Check for errors when mapping the shared object 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a5f0dc705c4401454d4fcd61e7301b992bfea13 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5f0dc705c4401454d4fcd61e7301b992bfea13 commit 6a5f0dc705c4401454d4fcd61e7301b992bfea13 Author: Mark Johnston AuthorDate: 2025-10-14 13:33:33 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +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. 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) --- 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,