From nobody Wed Nov 27 01:16:20 2024 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 4XyhNP1J82z5fJCf; Wed, 27 Nov 2024 01:16:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XyhNN6f2Bz4Zxl; Wed, 27 Nov 2024 01:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732670180; 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=qDCYK35IpVePP+0eqJirSFxnVyzhgcfaTNeJQB8RLTw=; b=vvQSwF89Xs8cLcAs9jB6XOzSKtfKi8Ycl9hxQ1kOIQJHbNqUy7+HvnzOAGk8N081eQZ5js BSeI5FeBmUdv4yeJDUuR4UrvS6x31y6LKfHHC72shLNYFvkaL4pF+qFVeQ6ErZnQfwIOaQ 781QcPF1tIcVTDCvVJCY87rcgKt7yoE17knNg2LVRZ4s/HlfE7pZjUJMaRFuVbKnbHDRAm y2VKsTnp6n9V9XM7GCq3Qiu1UTDvbIHvT+WyiqOvGk2DeYTdnmsMbWrkkgHEreHnFw205h Rpk8MzNYxxnIVqAsVqbIAChm5//P6xP751baPyDnxC+TI26XUMPn2NYaYastIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732670180; 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=qDCYK35IpVePP+0eqJirSFxnVyzhgcfaTNeJQB8RLTw=; b=YBZgeo387rtcYygZTf978NmGbvUOOY6pbu5NWiUenoU+VrGAPJsmbaTs3VsO62mWoVIFk2 nIaJM1P1nY220xblj3Ssqrcv6mOlaJg+wnPuzTLHjmuo2btpk4PzoExpaoQseZSY3GL0kR 7+lyJaHVgxKPm1y/UIQPwU9s0gOErTXDN4Cw5SL+K6WEUEOyZIjgH7vjvH0k/L8K4vcJwr U6Xx3c6978ya+jS5LvaPHBcq9c/xeU+u4aJvLUDGZ/kA7Me4oT+walHe0zyDL9hwc7WzOS dG0W0xnQvOaxNQGutiAPR/rBLgmvNENNiUgQgpIfAekkEtJqKqquLSJv9u4aPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732670180; a=rsa-sha256; cv=none; b=tSog8SbFOt2vsqiMZbAyuH/fi5tkYDiS+Wv428IWEW/x7Z3Hs9w23F3km6sCdEWjB7pWc0 TpTWpD7hTcOUwvZ8SI17O9HRHQTwPSJtiQQfZScYfKf0wOwuwINYBM6a0TXYw7XEpQSc/L H3q9VGonUEvxYLwT2PpQRQPlunPuvt7qtagt/iqeVdpteNBN8zC4povx0RMF0ZuRoUdjIX Mqa2ebqcQmB1Knyk4E7eqjJWAoaFTMxtE92nZfRfH/P80bylo9fS1HYiaT+pD00QqHXKg6 3FDnfA7fTPskRdeSb81M30M/v8C/Aj0wCb7ThimdgaKsxHlH3q21AX8SQIVaCA== 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 4XyhNN6GDBzpDR; Wed, 27 Nov 2024 01:16:20 +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 4AR1GKpt055799; Wed, 27 Nov 2024 01:16:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AR1GKFt055796; Wed, 27 Nov 2024 01:16:20 GMT (envelope-from git) Date: Wed, 27 Nov 2024 01:16:20 GMT Message-Id: <202411270116.4AR1GKFt055796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ed4b2d159459 - stable/14 - _dl_iterate_phdr_locked(): fix libc and libdl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed4b2d159459350e1f4160f72961bd0f3a40ea10 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ed4b2d159459350e1f4160f72961bd0f3a40ea10 commit ed4b2d159459350e1f4160f72961bd0f3a40ea10 Author: Konstantin Belousov AuthorDate: 2024-11-14 03:54:24 +0000 Commit: Kyle Evans CommitDate: 2024-11-27 01:15:56 +0000 _dl_iterate_phdr_locked(): fix libc and libdl Add prototype. Export from libdl. Fixes: 1426fd6cff0603f0ee275b99f2ba35dc36f3d0c2 Reviewed by: kevans Sponsored by: The FreeBSD Foundation (cherry picked from commit 209fd89a2810419309944f10d11834321f0ebb25) --- lib/libc/gen/dlfcn.c | 2 ++ lib/libdl/Symbol.map | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c index b814fdc845c4..bffee3952e0d 100644 --- a/lib/libc/gen/dlfcn.c +++ b/lib/libc/gen/dlfcn.c @@ -204,6 +204,8 @@ dl_init_phdr_info(void) #endif #pragma weak _dl_iterate_phdr_locked +int _dl_iterate_phdr_locked(int (*callback)(struct dl_phdr_info *, + size_t, void *), void *data); int _dl_iterate_phdr_locked( int (*callback)(struct dl_phdr_info *, size_t, void *) __unused, diff --git a/lib/libdl/Symbol.map b/lib/libdl/Symbol.map index dd9a8252e4a3..f0e03c4940ce 100644 --- a/lib/libdl/Symbol.map +++ b/lib/libdl/Symbol.map @@ -22,3 +22,7 @@ FBSD_1.8 { rtld_get_var; rtld_set_var; }; + +FBSDprivate_1.0 { + _dl_iterate_phdr_locked; +};