From nobody Wed Apr 30 03:13:54 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 4ZnMhz1qvgz5tjYy; Wed, 30 Apr 2025 03:13:55 +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 4ZnMhy69pzz3CGH; Wed, 30 Apr 2025 03:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745982834; 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=W7udweF0nlcoNumJvEI+ei3uIhopxMUEJ+GWNiMLsr0=; b=jJbZOpZk65ywf5gm1v3ENOueunv6fE8Ij2E0Jb9UgMRA4jXbhgKP/uWDsW1BD3WFbmBUM0 TtkRkdK8lfoDFamxTcmy23+sPXuIUv22dtAaFIDQhY69kehQxvQ/u0FqfVuCjpYWNOgoJn 3z0cngkv4/GnP7nRybM9uZb3axDDx81/ZieiA8l2yQ9aMTx2JyMJ/Nc+1TKYHAqNlH3seY OnLUg0pov3BSxajazC3i1FPDL+JbRjzXSM7+rNZtYlduX16D1kxUyIGAZ/p4jYulBNCFwD y27lcL0+qQUkt++Gx6p15TGXzHL/79E5EhjgMRrvpy73OtqjkKxp6Gh+8fo9VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745982834; a=rsa-sha256; cv=none; b=iaIfIvk97QiqZWVCAgAxp/13//Cgcv/Xm/X8ECpc8OtZS0yXrW8g/gSgeoaWM7AdBhhrPx uiDLJfYoPInSwcKm1hSF/cBl9KL90VIxB/oyWpkichiwEYLoPT+owaReOLmpZceUkLtb7+ pVqnn2vuW3uWP+O2tpF89LLdAKLWBD4IxAqyTnbjU46UibNvNv1+i+XFHU2HLITQ9vjZka ut1cOktv6tsZrdHLgI0WVpLvNfEluOgo76CDYUGMMC6AzqoOPowXf2wlzOFuoQKwOfbOnu gxkSJKlacqMMLVpmyGxU+btC3pshwoCHdo+XxauxqYSCKklTmAAUDKRICQIEgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745982834; 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=W7udweF0nlcoNumJvEI+ei3uIhopxMUEJ+GWNiMLsr0=; b=HjAQVPipSIIQGbGAK32vW4IaU07U2IWuYpe5k3ZuunnuH14D65Mabn4R31UvwCI9KI2A5r R1Tbd2kWGpI+4Fi68IxOC62+vPQd9/O1AAo00xSGHesy6Fcbjl3zYvUxJBn5mEC/4x31JI DxdayIweudpVkAbZeeQLJUnYw5jQhcMtUrsDR7SYuyfsYa/nDOwzD/Zb6yi+ZDTWY6I9qC SrAaIMR11OMUsHJZnqBmeQz390txfk80HwRRPX9wAkpZ1CGgkvC7qcby3iCQLTEDcO7NXH rCygpvajOislk4vHMrOZAPvfldS7ETYWKo2OHRfX/zxdWpykMODlnJ2eOdsINA== 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 4ZnMhy5mDGznrB; Wed, 30 Apr 2025 03:13:54 +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 53U3DshU004744; Wed, 30 Apr 2025 03:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53U3DsDJ004741; Wed, 30 Apr 2025 03:13:54 GMT (envelope-from git) Date: Wed, 30 Apr 2025 03:13:54 GMT Message-Id: <202504300313.53U3DsDJ004741@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: 06fa889365b5 - stable/14 - rtld: symbolic and deepbind are equivalent for the refobj 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: 06fa889365b51b4b06d26bf60f8d5b89f340b8b1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06fa889365b51b4b06d26bf60f8d5b89f340b8b1 commit 06fa889365b51b4b06d26bf60f8d5b89f340b8b1 Author: Konstantin Belousov AuthorDate: 2025-04-19 10:26:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-30 03:13:12 +0000 rtld: symbolic and deepbind are equivalent for the refobj (cherry picked from commit d0ab6abbf5318fa09df1b145198d543c60f0685b) --- libexec/rtld-elf/rtld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index cc504666c649..6375867d1db1 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4624,12 +4624,13 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) */ res = symlook_obj(&req1, refobj); if (res == 0 && (refobj->symbolic || - ELF_ST_VISIBILITY(req1.sym_out->st_other) == STV_PROTECTED)) { + ELF_ST_VISIBILITY(req1.sym_out->st_other) == STV_PROTECTED || + refobj->deepbind)) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; assert(req->defobj_out != NULL); } - if (refobj->symbolic || req->defobj_out != NULL) + if (refobj->symbolic || req->defobj_out != NULL || refobj->deepbind) donelist_check(&donelist, refobj); if (!refobj->deepbind)