From nobody Wed Aug 17 00:34:25 2022 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 4M6ptT67knz4ZsvR; Wed, 17 Aug 2022 00:34:25 +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 4M6ptT5d1mz46q2; Wed, 17 Aug 2022 00:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660696465; 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=FUrPFbrte0pFWKbRHLXyh8ULuGc/B7MCKW5ZUdFmC3Y=; b=bgbq+/lwO+lQIIOlnfcp9dfLDozeArKkTEaEcnLYE6JfzQvugM8eMwZCq75yk5mc/pSJvL xUnP6osFOiVqAjl7CEdqPc4QgCiK+nOA+gPhHkEHp6XHmL8SXYXyA4zGX+mFMze+EbTE5S S/I+/zOxexenuXELqh4MoE80mm+A7uof3TfudaE9vQrgyDKRD9QMY1ZbhuLPp7H3L/0NcJ 1xfRvlwfqF2QxT9eOmdq8PE7KoAVZCb9uM94/FXBaX/6IKfzSmQEeeIxQC1H9sxcBds+1V SWfMX9664B8QrH2UwPIKCrsgSUR3tScvT2lgWRpCbXuUTcQO8ywA7sjEw4Qq4A== 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 4M6ptT4jD1zVL7; Wed, 17 Aug 2022 00:34:25 +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 27H0YPUx053947; Wed, 17 Aug 2022 00:34:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27H0YP4E053946; Wed, 17 Aug 2022 00:34:25 GMT (envelope-from git) Date: Wed, 17 Aug 2022 00:34:25 GMT Message-Id: <202208170034.27H0YP4E053946@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: a5afb6fe1ad0 - stable/13 - rtld: fix display of the mapbase for the traced objects 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: a5afb6fe1ad0e2f9909586ad49e159620de3ae65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660696465; 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=FUrPFbrte0pFWKbRHLXyh8ULuGc/B7MCKW5ZUdFmC3Y=; b=mZE5c3uzN5Uo7wPwvOfYTTRHr+CC5IU/HCfmJg9cpfJSxKn12m6GdwUNggM7EvNJ6Hnx0l Pyx5H0j43ztLqlAidO5DdMAL2+gkdnilEq9y++O1XoySO5lwWfdY+NP8T209obuvWGxUk+ OHN8jZXzQ1n+wos92nQjfEKF+B4Dg+ukyDzp/NlM0Effjs+ekPsdiCSmoykaw34ca4cP72 YKE65rCsCgmWe0lygWHSejaRyPpTtzUMrx200H+OUFmCtyenhbto7+0RdceKLzZslrjhgq xCTm7laiB5qlTXYfjNpfY5FlRHY4kBcgiEZ0ozjeShbGWUbiU+7k5gR5y3fy3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660696465; a=rsa-sha256; cv=none; b=q+n7Dcc91JpN8Sa4N8YrOYDHhiDeK264ALldkt+rn+OwMP7J5b7/gURsIDb4+vK5D9V4MS 5XKsA7f2m4rNT/GlaObH7jtje71VxkJhLQM4Zia9xIN5eDin7ysFnYEyRPvUU26y2V/Cm9 AP81OARHecxxnolWNrg6dYfgTabJQSHO3zQXV7EFVSqunBB/oPAdPYbl0mGV+LfPMieQ4V SzKjEPX+ji0lzL9I274esw2j9GKLOrR15wH6D92TMC48+uG+oQzI07v+Kk0lxD/O16eRLU WmZVNS/Mru6xPE6AONYre5BluwlPKjj9d+x5ClGNRN66XAbjJG62AiDWtfy+iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a5afb6fe1ad0e2f9909586ad49e159620de3ae65 commit a5afb6fe1ad0e2f9909586ad49e159620de3ae65 Author: Konstantin Belousov AuthorDate: 2022-08-14 14:57:40 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-17 00:34:09 +0000 rtld: fix display of the mapbase for the traced objects (cherry picked from commit 008475d3c83aecb496b2b08086427f68b2f741d5) --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ab3a0740bede..6c1e172651aa 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5079,7 +5079,7 @@ trace_loaded_objects(Obj_Entry *obj, bool show_preload) path = "not found"; name = obj->strtab + needed->name; - trace_print_obj(obj, name, path, main_local, + trace_print_obj(needed->obj, name, path, main_local, fmt1, fmt2); } }