Date: Sun, 14 Aug 2022 15:11:11 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 008475d3c83a - main - rtld: fix display of the mapbase for the traced objects Message-ID: <202208141511.27EFBBA8087474@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=008475d3c83aecb496b2b08086427f68b2f741d5 commit 008475d3c83aecb496b2b08086427f68b2f741d5 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2022-08-14 14:57:40 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208141511.27EFBBA8087474>