From nobody Wed Apr 23 19:25:06 2025 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 4ZjTZp6657z5tmLh; Wed, 23 Apr 2025 19:25:06 +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 4ZjTZp3ybKz3vt7; Wed, 23 Apr 2025 19:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745436306; 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=a2igMHbygWgOggcHO5+T58/qOv+pvafJP6u+4DNYMH0=; b=OubLLUD4BieMGHr8Sc7kQKyolmrGItc7W3wN5kWzizy2VOkKeEdxBhQPthB1UK+2vJ6fKq Qkaz+qR3wt+52C5KWlVyYZymw7QxDALSosZAxcj7HCrY7+EuV0TrXE0LbZpxEgaqXQu7MX tteeDfAZN8lG7NtKjWwxK6t0CshnhZmOt7ENjSQhnXMrNmzlk5VGrfGW1pL5A1bbvwkcOh vtAI5jbQZfTiNVNPAUgN4jpc4BvyN5B8FRwUxIVL4T/dvMIywmmJG7vFcdXlYxvgjKTqpr hSzZ4TgGVwa0adgvE2raM5eC13NdwAJVFvTDIRfrd8CNzes254/Q//AmUdetoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745436306; a=rsa-sha256; cv=none; b=ERNsqlEAzebDxtDXkupPu1FGbC6iVzY+LWj/psJ3tzd3WL11wxV8ND0Xo9DE/Snmc1Q/cX mshi4HdUqerwLacchiRaH3/oXFkxW5+M06Vtg6+4sgnhiOyCkRPn1Ag9IOlxMc/4LIwMOr Bj8lS5IOKSH1tc5RxbG4R/s81ykkoudDR7OVcaeNYYH+R7SUFxk3wvdQzK84O5KSPuX7Pb S4DFZ0C23z4M3KvyREwQLmyK0684FfWAlRbUuZkXCzkAT3iYRWB9gGTMGh6Xtcg+ozlAEX 9CkFmseHUplcj0P6dgv+XMg8xXmTNydeW/NHYQOtVsYaCA6KBGEAzagosxHX0Q== 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=1745436306; 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=a2igMHbygWgOggcHO5+T58/qOv+pvafJP6u+4DNYMH0=; b=Lru/z28iY1O5yWZZQXGh8Inup6MFvJYlLu4BiPRximIBnNUHz3tPhQBj1jK7b06/UMXdFV OQmjsBev+SyHPdxfVBJ8d9MyN+o+gQ1Nw2Fu/pLtv9petG5DbyTI5yAHGV/txZtcpf/b8W zjjGeZoP2Nria5fnTOo3xCjGV3DCAn8Fzd+5QmgbQQCo4r+8fH2G4ZJaj96cfiOmnPZdK5 Si5RGjfiiOzPOs8vDSDXT9FHxP1MxIx1S/mNBipp+lFYa7rrO6MPO6UzK10kB8kEOEcuro Ti7krcMZGL2uJND8ZYc7pY6IH+UN3sy2s+0W5sTXhUr+eaHK9CPgnzrgdNyy5A== 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 4ZjTZp3Gdxz1tD; Wed, 23 Apr 2025 19:25:06 +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 53NJP6IF020364; Wed, 23 Apr 2025 19:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NJP6P0020361; Wed, 23 Apr 2025 19:25:06 GMT (envelope-from git) Date: Wed, 23 Apr 2025 19:25:06 GMT Message-Id: <202504231925.53NJP6P0020361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d0ab6abbf531 - main - rtld: symbolic and deepbind are equivalent for the refobj List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d0ab6abbf5318fa09df1b145198d543c60f0685b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0ab6abbf5318fa09df1b145198d543c60f0685b commit d0ab6abbf5318fa09df1b145198d543c60f0685b Author: Konstantin Belousov AuthorDate: 2025-04-19 10:26:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-23 19:04:29 +0000 rtld: symbolic and deepbind are equivalent for the refobj Reported by: avg Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 13b24a259bec..fa96a516687e 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4677,12 +4677,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)