From nobody Thu Jan 6 07:15:29 2022 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 1B6B1193AE7A; Thu, 6 Jan 2022 07:15:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JTyL95lv3z4c0X; Thu, 6 Jan 2022 07:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A63CB1B9D7; Thu, 6 Jan 2022 07:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2067FTP0004439; Thu, 6 Jan 2022 07:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2067FT0D004438; Thu, 6 Jan 2022 07:15:29 GMT (envelope-from git) Date: Thu, 6 Jan 2022 07:15:29 GMT Message-Id: <202201060715.2067FT0D004438@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: 2bf21b0e8e6f - main - Restore DT_DEBUG processing 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2bf21b0e8e6f472f116a5806c05c379f0aaf4c55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641453329; 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=I9RuItgn9lE0cwkc6r+p17At5F6Dc5i+u7Y2BrWQsqM=; b=XkVZQnhjmU6Dvqu0niAmlJObogVUiu2dOe1oT3mlCQW1RcVUvqudBtE4M5HZXnWQ/ueByk 9qBEz+yIRP/lgFsgaWhuO7jOZ4XXaMdAIqRtwDjYKXiYKG+elQLDh0/PWkdSWOcwGlKEra /UTHiXFEE0qcrO+1KaRCUYLOT/QWdO/ofuOwMxml65cIcXc2OoY2JOcqVh91CqWFRBOk8R OQK7lRhqDSdwyAROc/vivUartWkIq0bRJ4m7vgqB7627oKl7PNaJhNbihnhJEv8y9LazGz vbZqBPvwruH+CjUQfl+2eeE+9KirNfzE16SA73Qwl+ZbkEkr+WNK+b06uarCsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641453329; a=rsa-sha256; cv=none; b=uNn3GUzfFBzjbNsiundJF4jrPMJafM9LLuspzUrNMuwBE0jixn8rkyAm5GKiAbKO8e0NLn Lv8MV4uwbUOlLqbcUUvSNGzgpkhmfrmWI9ZkB169vRhRSlNcIrUyCJY+V7qwGh7rTlP2o1 9hvn8kbft6ZHiUk/bL38o9qM+vjhYm2l0fYC19bBD+gQR9Ykwshc/U2270Ew4NEkBegTHQ 2kuKMrxJsVuHZwFgc6ayhIFn5QGx+n57TMhNH191h3FrRMb7BXeGxg+u/+U/dqiVcIdygC FkVdRpMM1Tk54AWo8+lnb44wdm7YMYiR1IFwqQGomNIcKJ0cP74XT4Q7/R2g7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2bf21b0e8e6f472f116a5806c05c379f0aaf4c55 commit 2bf21b0e8e6f472f116a5806c05c379f0aaf4c55 Author: Konstantin Belousov AuthorDate: 2022-01-06 07:14:09 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-06 07:14:09 +0000 Restore DT_DEBUG processing Pointed out by: kevans Fixes: 292cba9b4919ee188ca08cc8bf5057e346514383 Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 14c4d44f50e4..e5ab2405a79c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1461,6 +1461,12 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, obj->fini_array_num = dynp->d_un.d_val / sizeof(Elf_Addr); break; + case DT_DEBUG: + if (!early) + dbg("Filling in DT_DEBUG entry"); + (__DECONST(Elf_Dyn *, dynp))->d_un.d_ptr = (Elf_Addr)&r_debug; + break; + case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) obj->z_origin = true;