From nobody Sat Oct 10 17:03:36 2026 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 4j296c5Gzpz6vV1j for ; Sat, 10 Oct 2026 17:03: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j296c4j56z4RlP for ; Sat, 10 Oct 2026 17:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791651816; 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=rsHCOCAvJ/iKKtlBamfMsfTcSLmo7M4wfb5NObrig3U=; b=H0m2tHoRYgwt2WZAaF3K45zwaGUvBt65iHlBEW0Lt9eGw9LB4PiTfQOrd7JFqyfD3IHVqF AvpgVGehhoNrkYrImN0HRBFEsmBZltoA2EDglG+Yh1JeslkMW9I0hiaigr1LL97lhzS6i+ VG7zAyaXoKZgGL/xI0LaOuUwQO0Q3I8E3JCxdLVUwnPgo9kOTOzJOMbhH5WFGKNgNy3ANK F7dvxeNYgFO1hxDYABoWF2lkMjzUKiJ/3X1oCJXYfgtQXS/V2Hg1NQO+cwqnJZB56x3BYw VFR1oaaAftoFbAEN3xr1yKRL0H8QmYziq9QZaA+6iPR1C7S8zai8QhJ5rSXNEA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791651816; b=Z5Mq1dCnj0nTx1gfGFx/frtVSlJ5H5vUR54GHNOyPdVPX9PnnDy4JFT+BHgmXZ39J/SDK7 QM6svWxEvQptd172x9XYkZsMh9ik/vhi2eWxUbUhwBN7HJDzg+WgWPkXyolkSWPe7rSKN4 eyA7KH6PiBqSrP8F3KOOZJcVTR94UiFprtkqi/khGW/jiMT33Eia4HIIncKzyYozR9sTGq c/TKT2SZR36mSDJQUMFxL3mNDSNOmW062ARZxs2sF+ilro4JBz8f4I++3m4SvdeipE5sXP 0tPAjvOqjH+d1oNSmw5dqD3If2XhbgNHOAx3U6eiYd28aSWtaOg7qMxGFxROAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791651816; 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=rsHCOCAvJ/iKKtlBamfMsfTcSLmo7M4wfb5NObrig3U=; b=tyjmmyhiLJNSuo8tbbgT9J+ED0YeHA5fZdWypkUOO0pkmiGOBdoiciZ22wRTy+Zn2igdh1 j72p4zUCe7OtRvButoEEncYYgKWuuT4FPFUhNkmXbHOyGj+ZWdQsos6uh4CMVeDQ0Yryew LBrRNoQ+6+yLzstslL/oRczqDZBL3GGlpkrcpbSyqQL5mTvj1RzcRaW/V+T01WWUam1l3H a578NVSJvafU9ryp4kEHupQuY7JJMDGH9548n1hQx9IOuj8otRr86no7nV9pGQAqXFvWus wxAf+Hflr6rNgUnoGYK6XBPRKiRNYG1yiuxzc9ZIYCwVwA/Kl1SZGQ8iD+cqmg== 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 4j296c3TPdz13P3 for ; Sat, 10 Oct 2026 17:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 198f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 17:03:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ef758b59a44e - main - rtld: release rtld_bind_lock around calls to .preinit_array initializers List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: ef758b59a44e6b5b2d2dc178b97c01cde1b34570 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 17:03:36 +0000 Message-Id: <6aca6fe8.198f1.65734a99@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef758b59a44e6b5b2d2dc178b97c01cde1b34570 commit ef758b59a44e6b5b2d2dc178b97c01cde1b34570 Author: Konstantin Belousov AuthorDate: 2026-10-10 15:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-10 17:03:01 +0000 rtld: release rtld_bind_lock around calls to .preinit_array initializers We unlock the bind lock around .init calls anyway. Also, the main object cannot be unloaded. Reported and reviewed by: dim PR: 298943 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D60588 --- 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 c64fb689276d..b637a3032218 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); } /*