From nobody Sun Aug 14 15:11:11 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 4M5LTX18ycz4ZKkH; Sun, 14 Aug 2022 15:11:12 +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 4M5LTX0BLxz3fCJ; Sun, 14 Aug 2022 15:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660489872; 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=Amj2HX+k4d9+m5hze7dMP4YHGb0QOOCsAZNivkzO+NE=; b=wqjkxad7+Ua5nvy99oUdeu0B9qEiH4+QNH3RdlS1m99IA7yIwYZ/gfpdmj4yg4vduq1CAT niz9k+gmP9+LTpjLaV2IlU6ud1YelDhp/kjXkXNJohgeDmu0yXpsotx9Q3FdsBM8QOkQBj oNBdKeukgjH+UqD/vjUJl1DNylgD1icx4GG23mlNeHgnyckf2BSLtaoBCUwKt8geutKXU/ /fZurqHUi4Bdw6Hc4Ih58VNjqH0qUesIC1c91ztvaD/l+kUDBo3TCWxCcP13d3gzTAw+4V 6bEs+TYH4hVXUDsn1xvFc4aqH9eaUxIa5Q6aVhUCY5nGu6YafdhjB+nd6B7Dow== 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 4M5LTW6MmxzvVZ; Sun, 14 Aug 2022 15:11:11 +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 27EFBBW9087475; Sun, 14 Aug 2022 15:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27EFBBA8087474; Sun, 14 Aug 2022 15:11:11 GMT (envelope-from git) Date: Sun, 14 Aug 2022 15:11:11 GMT Message-Id: <202208141511.27EFBBA8087474@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: 008475d3c83a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 008475d3c83aecb496b2b08086427f68b2f741d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660489872; 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=Amj2HX+k4d9+m5hze7dMP4YHGb0QOOCsAZNivkzO+NE=; b=M51VJ7DhhswIMd97x/VYpUn7ZHFbfyjRJYZC5teATSRURiPY2HKK7pYhJ9iLwb/cvj+qDh 3fyfYU2OWGOvKZU5b8Afnfo8IcH/DwyKsKPf2Q2sHr5feB5dxZVhU6El6Wan9n0Mt9f2QF bb8mvR9XlaqQXOuZ4112WGsz9vGoUxi52e7qZhgSAHc+urCi4ZXm+qJOCuJOOVI+rVsWqo WeJHhINHawdqytA2EAEaWUvjLVfz9eD1l1e31zlbY414JSh1khycPk7zSb60/ygl/1z/1k sZmXYxX4gpQ/5PI09Iyqa6LTUZmPsoKXLZJh212KH9+yf5QbcYI3QhhiCeZbEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660489872; a=rsa-sha256; cv=none; b=ZFLYtHoiase21y1a3z6Xzg5HoojNafKwlTntX4fVK6Uvfjd9tfZc37re6gRwO7nk+HslXS MEZ2XCP75mg2fumqSguQi5kzdlqKOmWaBb131gwbdL0sJsgvwPCMwIxcifFkExyDHC0VBN sj+OWBmP4nVNjvOjyCSnq6CyVIa9Ue/J0AK8dn0lw2rbRUTC1NEIzKrrgpr1DO138T+9uh LN6y/73ErOrrquGnMYiSNH8YcoNtLJ2gOcVnPQvAGGYqb/CoDUwKLMGi9e+BhdWDQ6AuhQ X0nyWW6aTAPmDo4XdLmzC5Wn8ameD6MqQbkhnjzxQuir7I0bj1sHcpivYLfPoQ== 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=008475d3c83aecb496b2b08086427f68b2f741d5 commit 008475d3c83aecb496b2b08086427f68b2f741d5 Author: Konstantin Belousov AuthorDate: 2022-08-14 14:57:40 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-14 15:11:06 +0000 rtld: fix display of the mapbase for the traced objects Commit 24d0c9c1f565bab6e introduced the following regression: % ldd /bin/ls /bin/ls: libutil.so.9 => /lib/libutil.so.9 (0x1021000) libncursesw.so.9 => /lib/libncursesw.so.9 (0x1021000) libc.so.7 => /lib/libc.so.7 (0x1021000) Note that the base address is the same for all displayed libraries. Fix it by passing correct object to trace_print_obj(). Fixes: 24d0c9c1f565bab6e Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D36198 --- 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 7828bf413a7a..64b94f691898 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5033,7 +5033,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); } }