From nobody Sat May 10 19:33:09 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 4ZvwyF4qtXz5vkVJ; Sat, 10 May 2025 19:33:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyF1yySz3Sw4; Sat, 10 May 2025 19:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905589; 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=htqvM8XXBc9hNpU6oPMXCYoxJk/MiBlgOA7BfJV6pw4=; b=DamqLpSMykGqK13XkkvLxyZ3u85DUFc3KThWg7Suxh1HunSqETZeDHMDimU365R5lRfC6y jb/Fces3kef/GPO4nmewQbSKzX1p3HpkcC5h9p2zy2AIph0eeD20UifYvzQis62fXNzE5i m9gXEFDKUgmME1OZJJ7m34YCUAtRoZkTyBOXTDb8bobC7IBPZdpkFHR0db5I10blZpgObg 4/gXwPLtwcJyz5UPFcwmU6CkbrZcHnng/ZVI+xVFT41q7uNHyRpBxcp/eovx6EeKAMwfnv Iob4NEZFCvAq15wtnPDERdK/KO/uloFr+BswAnjp3ndgUDzFNtvJCcyc4u8GKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905589; 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=htqvM8XXBc9hNpU6oPMXCYoxJk/MiBlgOA7BfJV6pw4=; b=LVyEQPXwmCRaImYhTWv/SHmRVF9B8kaToHCTh1dGU1vo99XcsLsmsz7rqBls93nYpqTDxC UBit6rafi4QHrNDRND1ux11gz8O3LPn+aOejEgddYEvH0OHxu/GpVWaeGI2mZNnxL51Vjt ObvmJQO9krnGQEnnHiBKqRVfd8jgAmnKaXA1WZu99Ts69O9a134IgsWkEjN1/GvzCdJ1hJ BtAYM8dNRvqmrVpA4FglGjSOl8FVzlQMvtS8s2UA872b95q6tLylaSwk7+utSqNBwcRLp0 yEYoHKpoWGrR6BAXKG4nJeBq/4NftC1mzAomOD04W98FoW+BpHICeE19Rn1jkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905589; a=rsa-sha256; cv=none; b=nMPpU0R/96Ia9Q6WQyM5atkR+mfdGynVH6ZkfDtL7pMZ6Xcmfv2ssvQA2stCyYecwSojSK gMsVLOu87863KeOe2YJVDGQcMXERSs8KA+PJzyCaVR6CYf8jnJ7jXMUG9vqLsufmT4BJnq Ick8Npbit/0zxMKrj9Vu3WnWbLR36xW1q8cb5xt7N/CiCaOda9lKft3ubU/fyhKB2dTRU8 yjHEW6bOSbskrMA76JMl3D+4ejGx0cX0TEggX1z8480eXD9xsFxi19Df2IKYcDOTeQerGh hDmIktNmaTxdIbmzjFHZaWC6+a6tu2QgzTilImEbXmzplJ0b6EKfGh/cpHuh+w== 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 4ZvwyF1L0Gzyfk; Sat, 10 May 2025 19:33:09 +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 54AJX9Wi054961; Sat, 10 May 2025 19:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX9DQ054958; Sat, 10 May 2025 19:33:09 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:09 GMT Message-Id: <202505101933.54AJX9DQ054958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5f195cb44bee - stable/14 - rtld: do not call into ifunc resolvers with the bind lock write-locked 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f195cb44beee2ee952252245937a9bb7a395e38 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5f195cb44beee2ee952252245937a9bb7a395e38 commit 5f195cb44beee2ee952252245937a9bb7a395e38 Author: Konstantin Belousov AuthorDate: 2025-05-01 15:44:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:57:45 +0000 rtld: do not call into ifunc resolvers with the bind lock write-locked PR: 286502 (cherry picked from commit c66c0a8479e62f3e3e085252839cddace4d4bbf5) --- libexec/rtld-elf/rtld.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 6375867d1db1..ba8e2aea6e7c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1018,6 +1018,7 @@ _rtld_bind(Obj_Entry *obj, Elf_Size reloff) Elf_Addr target; RtldLockState lockstate; +relock: rlock_acquire(rtld_bind_lock, &lockstate); if (sigsetjmp(lockstate.env, 0) != 0) lock_upgrade(rtld_bind_lock, &lockstate); @@ -1031,10 +1032,15 @@ _rtld_bind(Obj_Entry *obj, Elf_Size reloff) NULL, &lockstate); if (def == NULL) rtld_die(); - if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) + if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) { + if (lockstate_wlocked(&lockstate)) { + lock_release(rtld_bind_lock, &lockstate); + goto relock; + } target = (Elf_Addr)rtld_resolve_ifunc(defobj, def); - else + } else { target = (Elf_Addr)(defobj->relocbase + def->st_value); + } dbg("\"%s\" in \"%s\" ==> %p in \"%s\"", defobj->strtab + def->st_name,