From: Khem Raj <raj.khem@gmail.com>
To: libc-alpha@sourceware.org
Cc: Mark Hatle <mark.hatle@windriver.com>,
Mark Hatle <mark.hatle@kernel.crashing.org>,
Khem Raj <raj.khem@gmail.com>
Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first
Date: Thu, 9 Dec 2021 15:53:54 -0800 [thread overview]
Message-ID: <20211209235354.1558088-1-raj.khem@gmail.com> (raw)
From: Mark Hatle <mark.hatle@windriver.com>
According to the ELF specification:
When resolving symbolic references, the dynamic linker examines the symbol
tables with a breadth-first search.
This function was using a depth first search. By doing so the conflict
resolution reported to the prelinker (when LD_TRACE_PRELINKING=1 is set)
was incorrect. This caused problems when their were various circular
dependencies between libraries. The problem usually manifested itself by
the wrong IFUNC being executed.
Similar issue has been reported here [1]
[BZ# 20488]
[1] https://sourceware.org/legacy-ml/libc-alpha/2016-05/msg00034.html
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
elf/dl-deps.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 237d9636c5..e15f7f83d8 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -73,13 +73,19 @@ _dl_build_local_scope (struct link_map **list, struct link_map *map)
{
struct link_map **p = list;
struct link_map **q;
+ struct link_map **r;
*p++ = map;
map->l_reserved = 1;
- if (map->l_initfini)
- for (q = map->l_initfini + 1; *q; ++q)
- if (! (*q)->l_reserved)
- p += _dl_build_local_scope (p, *q);
+
+ for (r = list; r < p; ++r)
+ if ((*r)->l_initfini)
+ for (q = (*r)->l_initfini + 1; *q; ++q)
+ if (! (*q)->l_reserved)
+ {
+ *p++ = *q;
+ (*q)->l_reserved = 1;
+ }
return p - list;
}
--
2.34.1
next reply other threads:[~2021-12-09 23:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 23:53 Khem Raj [this message]
2022-01-11 19:26 ` Adhemerval Zanella
2022-01-12 19:08 ` Mark Hatle
2022-01-12 20:12 ` Adhemerval Zanella
2022-01-12 20:41 ` Mark Hatle
2022-01-13 11:52 ` Adhemerval Zanella
2022-01-13 16:33 ` Mark Hatle
2022-01-13 17:20 ` Adhemerval Zanella
2022-01-13 18:00 ` Mark Hatle
2022-01-13 18:37 ` Adhemerval Zanella
2022-01-13 19:01 ` Carlos O'Donell
2022-01-13 19:02 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211209235354.1558088-1-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=mark.hatle@kernel.crashing.org \
--cc=mark.hatle@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).