From nobody Sat Oct 17 00:26:38 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 4j62g81d3cz6w5kJ for ; Sat, 17 Oct 2026 00:26:44 +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 4j62g76nM5z4TtT for ; Sat, 17 Oct 2026 00:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792196804; 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=O+SIMID/CJumbAZ5w/VVrM6uRHTLYbs5UsEw8d1/hl0=; b=tDuNoCARIQoTuZ+jETpUurYfAe5Tye+MiOhD9PKFITVPtkuRYTE0IlzwYkFGqCEA0eiLdq AxELrxZ/e8STjDML5gi3mPvyCrVTTm01NgimRDAEc+gC+hBvJfOJVTUP6KFGvHTqxDsZ53 R5Ild2PXZ8SsqBMDCdP7vasXYRRJSkOndSeMEIBhx8AlrN0Ls+3mlOa38uEJ/cTDcWylk0 Zr31e8lq/Ak9SePmOJggbFTwzwwGYHtLIyMrZhsP8W2E6ewJzawb7WwkLddUArLHNSWral BTr9aReag4RSkozADm5eF5UTFmKtglsQ3rdQHSD59oHvhddGslLaLwdCQ+r4ww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792196803; b=HA9o/d3DZGN3J73mcWo8mwbIqxJus1y/vGX2jDdETt9fBMxwVbYuinLzEg5ZZfg4TXQxuz QrndVUubKeEHLi+umXl7XtSqKj/Bw3Inf8ipzraBpELwsRfKW5VxeTTc8N4/E+bcEAyIkh DaxiaxQlzzxFm4QeIMJQVZ3lyLKd7gevE/YN1F2g6fpmhiWoJDn2btpK+Uy65aZzj8IHq6 4BDe8+1PhdfSOBEp8kSZWY5hNWzCz+xN8DsncM2Wll5nwmeXOnfEaqZ60u7aamOa9ThpRM PjLTqa6nQny8xn0PcsExnqjyBAxz0z8igloyeqO9/YbBeT5I48ZBPvIgz84UWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792196803; 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=O+SIMID/CJumbAZ5w/VVrM6uRHTLYbs5UsEw8d1/hl0=; b=EmQ8cRi6Dvj8Ao3yuMl+Py/JB8XJkLcBYVhZ3EVN8YrYh3fuFDN6kuoDSNjl+EsncZ6Uy1 HW8y16ksegwr2E8rWUYT3CXO1yUZY+ik9LdwLiGN+tcbJAS7p+7V7/5YcUIPjr/f/MoPXq GUoGaAc0cRSC7pwY9BQDu6dVRhH03BWmaK9NFlMPXbeZQ31OnS8nHZQvxdUf8wYfp9rHx2 yE9Qgmew02DoWSYHsyQj88IyEZ4qKulw79Qm65bOD4Q0sAPmUAPwGt3BmFi4V5nJGPH4i4 PV7I+ekIYy/wg6LPITzmDZyvKdq5xGeii5+WTt6d9jUOsTBgoeqjepKVgEENLw== 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 4j62g769FTzkLk for ; Sat, 17 Oct 2026 00:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 00:26:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: afea1a2429bf - stable/15 - rtld: release rtld_bind_lock around calls to .preinit_array initializers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: afea1a2429bf15ced38993c00cdd5da344ac46e4 Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 00:26:38 +0000 Message-Id: <6ad2c0be.25c95.2d089760@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afea1a2429bf15ced38993c00cdd5da344ac46e4 commit afea1a2429bf15ced38993c00cdd5da344ac46e4 Author: Konstantin Belousov AuthorDate: 2026-10-10 15:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-17 00:26:18 +0000 rtld: release rtld_bind_lock around calls to .preinit_array initializers PR: 298943 (cherry picked from commit ef758b59a44e6b5b2d2dc178b97c01cde1b34570) --- libexec/rtld-elf/rtld.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 4dece0e80d04..b04f0bab8f3a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -187,7 +187,7 @@ static char *origin_subst_one(Obj_Entry *, char *, const char *, const char *, bool); static char *origin_subst(Obj_Entry *, const char *); static bool obj_resolve_origin(Obj_Entry *obj); -static void preinit_main(void); +static void preinit_main(RtldLockState *lockstate); static void rtld_recalc_bind_not(const char *); static void rtld_recalc_dangerous_ld_env(void); static void rtld_recalc_debug(const char *); @@ -1005,7 +1005,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) rtld_exit_ptr = rtld_exit; if (obj_main->crt_no_init) - preinit_main(); + preinit_main(&lockstate); objlist_call_init(&initlist, &lockstate); _r_debug_postinit(&obj_main->linkmap); objlist_clear(&initlist); @@ -3122,7 +3122,7 @@ obj_from_addr(const void *addr) } static void -preinit_main(void) +preinit_main(RtldLockState *lockstate) { uintptr_t *preinit_addr; int index; @@ -3131,6 +3131,7 @@ preinit_main(void) if (preinit_addr == NULL) return; + lock_release(rtld_bind_lock, lockstate); for (index = 0; index < obj_main->preinit_array_num; index++) { if (preinit_addr[index] != 0 && preinit_addr[index] != 1) { dbg("calling preinit function for %s at %p", @@ -3140,6 +3141,7 @@ preinit_main(void) call_init_pointer(obj_main, preinit_addr[index]); } } + wlock_acquire(rtld_bind_lock, lockstate); } /*