about summary refs log tree commit diff
path: root/elf/dl-sym.c
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2022-05-27 12:34:49 -0700
committerFangrui Song <maskray@google.com>2022-05-27 12:34:49 -0700
commitefa7936e4c91b1c260d03614bb26858fbb8a0204 (patch)
tree185200d244eb184a647b7b76d2cc7465d15f2f41 /elf/dl-sym.c
parentf8587a61892cbafd98ce599131bf4f103466f084 (diff)
downloadglibc-efa7936e4c91b1c260d03614bb26858fbb8a0204.tar.gz
glibc-efa7936e4c91b1c260d03614bb26858fbb8a0204.tar.xz
glibc-efa7936e4c91b1c260d03614bb26858fbb8a0204.zip
dlsym: Make RTLD_NEXT prefer default version definition [BZ #14932]
When the first object providing foo defines both foo@v1 and foo@@v2,
dlsym(RTLD_NEXT, "foo") returns foo@v1 while dlsym(RTLD_DEFAULT, "foo")
returns foo@@v2.  The issue is that RTLD_DEFAULT uses the
DL_LOOKUP_RETURN_NEWEST flag while RTLD_NEXT doesn't.  Fix the RTLD_NEXT
branch to use DL_LOOKUP_RETURN_NEWEST.

Note: the new behavior matches FreeBSD rtld.  Future sanitizers will not
need to add versioned interceptors like https://reviews.llvm.org/D96348

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-sym.c')
-rw-r--r--elf/dl-sym.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index aa993942df..b1cf42f36d 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -144,7 +144,7 @@ RTLD_NEXT used in code not dynamically loaded"));
 	l = l->l_loader;
 
       result = GLRO(dl_lookup_symbol_x) (name, match, &ref, l->l_local_scope,
-					 vers, 0, 0, match);
+					 vers, 0, flags, match);
     }
   else
     {