aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile1
-rw-r--r--elf/dl-lookup.c48
-rw-r--r--elf/dl-reloc.c2
-rw-r--r--elf/dl-version.c23
-rw-r--r--elf/libdl.map7
-rw-r--r--elf/link.h2
6 files changed, 48 insertions, 35 deletions
diff --git a/elf/Makefile b/elf/Makefile
index ae7dda9638..33d57ed70f 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -40,6 +40,7 @@ distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
extra-libs = libdl
extra-libs-others = $(extra-libs)
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr
+libdl-map := libdl.map
before-compile = $(objpfx)trusted-dirs.h
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 294dfb951f..f2ce4c9c3c 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -25,10 +25,14 @@
#include "dl-hash.h"
#include <dl-machine.h>
-#include "../stdio-common/_itoa.h"
+#include <stdio-common/_itoa.h>
#define VERSTAG(tag) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
+/* We need this string more than once. */
+static const char undefined_msg[] = "undefined symbol: ";
+
+
struct sym_val
{
ElfW(Addr) a;
@@ -105,16 +109,10 @@ do_lookup (const char *undef_name, unsigned long int hash,
&& sym->st_shndx == SHN_UNDEF))
continue;
- switch (ELFW(ST_TYPE) (sym->st_info))
- {
- case STT_NOTYPE:
- case STT_FUNC:
- case STT_OBJECT:
- break;
- default:
- /* Not a code/data definition. */
- continue;
- }
+ if (ELFW(ST_TYPE) (sym->st_info) > STT_FUNC)
+ /* Ignore all but STT_NOTYPE, STT_OBJECT and STT_FUNC entries
+ since these are no code/data definitions. */
+ continue;
if (sym != ref && strcmp (strtab + sym->st_name, undef_name))
/* Not the symbol we are looking for. */
@@ -129,7 +127,7 @@ do_lookup (const char *undef_name, unsigned long int hash,
if (verstab != NULL)
{
ElfW(Half) ndx = verstab[symidx] & 0x7fff;
- if (map->l_versions[ndx].hash != 0)
+ if (ndx > 2) /* map->l_versions[ndx].hash != 0) */
continue;
}
}
@@ -143,7 +141,7 @@ do_lookup (const char *undef_name, unsigned long int hash,
symbol must not simply disappear. */
if (version->filename != NULL
&& _dl_name_match_p (version->filename, map))
- return -1;
+ return -2;
/* Otherwise we accept the symbol. */
}
else
@@ -177,11 +175,14 @@ do_lookup (const char *undef_name, unsigned long int hash,
/* Local symbols are ignored. */
break;
}
+
+ /* There cannot be another entry for this symbol so stop here. */
+ break;
}
- /* If this current is the one mentioned in the verneed entry it
- is a bug. */
- if (version != NULL && version->filename != NULL
+ /* If this current map is the one mentioned in the verneed entry
+ and we have not found a weak entry, it is a bug. */
+ if (symidx == STN_UNDEF && version != NULL && version->filename != NULL
&& _dl_name_match_p (version->filename, map))
return -1;
}
@@ -214,7 +215,7 @@ _dl_lookup_symbol (const char *undef_name, const ElfW(Sym) **ref,
(*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK))
/* We could find no value for a strong reference. */
_dl_signal_error (0, reference_name,
- make_string ("undefined symbol: ", undef_name));
+ make_string (undefined_msg, undef_name));
*ref = current_value.s;
return current_value.a;
@@ -289,14 +290,16 @@ _dl_lookup_versioned_symbol (const char *undef_name, const ElfW(Sym) **ref,
version->name,
" not defined in file ",
version->filename,
- " with link time reference"));
+ " with link time reference",
+ res == -2
+ ? " (no version symbols)" : ""));
}
if (current_value.s == NULL &&
(*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK))
/* We could find no value for a strong reference. */
_dl_signal_error (0, reference_name,
- make_string ("undefined symbol: ", undef_name,
+ make_string (undefined_msg, undef_name,
", version ", version->name ?: NULL));
*ref = current_value.s;
@@ -337,11 +340,10 @@ _dl_lookup_versioned_symbol_skip (const char *undef_name,
(*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK))
{
/* We could find no value for a strong reference. */
- static const char msg[] = "undefined symbol: ";
const size_t len = strlen (undef_name);
- char buf[sizeof msg + len];
- memcpy (buf, msg, sizeof msg - 1);
- memcpy (&buf[sizeof msg - 1], undef_name, len + 1);
+ char buf[sizeof undefined_msg + len];
+ memcpy (buf, undefined_msg, sizeof undefined_msg - 1);
+ memcpy (&buf[sizeof undefined_msg - 1], undef_name, len + 1);
_dl_signal_error (0, reference_name, buf);
}
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index bec5881d0e..5b22a506da 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -68,7 +68,7 @@ _dl_relocate_object (struct link_map *l, struct link_map *scope[], int lazy)
ELF_DYNAMIC_RELOCATE (l, lazy);
}
- /* Mark the object so we know ths work has been done. */
+ /* Mark the object so we know this work has been done. */
l->l_relocated = 1;
if (l->l_info[DT_TEXTREL])
diff --git a/elf/dl-version.c b/elf/dl-version.c
index 71eff0d962..f7df9805b3 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <assert.h>
-#include "../stdio-common/_itoa.h"
+#include <stdio-common/_itoa.h>
/* Set in rtld.c at startup. */
@@ -53,13 +53,13 @@ extern char **_dl_argv;
static inline struct link_map *
-find_needed (struct link_map *map, const char *name)
+find_needed (const char *name)
{
unsigned int n;
- for (n = 0; n < map->l_nsearchlist; ++n)
- if (_dl_name_match_p (name, map->l_searchlist[n]))
- return map->l_searchlist[n];
+ for (n = 0; n < _dl_loaded->l_nsearchlist; ++n)
+ if (_dl_name_match_p (name, _dl_loaded->l_searchlist[n]))
+ return _dl_loaded->l_searchlist[n];
/* Should never happen. */
return NULL;
@@ -72,10 +72,10 @@ match_symbol (const char *name, ElfW(Word) hash, const char *string,
{
const char *strtab = (const char *) (map->l_addr
+ map->l_info[DT_STRTAB]->d_un.d_ptr);
- ElfW(Addr) def_offset = map->l_info[VERSTAG (DT_VERDEF)]->d_un.d_ptr;
+ ElfW(Addr) def_offset;
ElfW(Verdef) *def;
- if (def_offset == 0)
+ if (map->l_info[VERSTAG (DT_VERDEF)] == NULL)
{
/* The file has no symbol versioning. I.e., the dependent
object was linked against another version of this file. We
@@ -87,7 +87,10 @@ no version information available (required by ",
return 0;
}
- def = (ElfW(Verdef) *) (map->l_addr + def_offset);
+ def_offset = map->l_info[VERSTAG (DT_VERDEF)]->d_un.d_ptr;
+ assert (def_offset != 0);
+
+ def = (ElfW(Verdef) *) ((char *) map->l_addr + def_offset);
while (1)
{
/* Currently the version number of the definition entry is 1.
@@ -179,7 +182,7 @@ _dl_check_map_versions (struct link_map *map, int verbose)
while (1)
{
ElfW(Vernaux) *aux;
- struct link_map *needed = find_needed (map, strtab + ent->vn_file);
+ struct link_map *needed = find_needed (strtab + ent->vn_file);
/* If NEEDED is NULL this means a dependency was not found
and no stub entry was created. This should never happen. */
@@ -227,7 +230,7 @@ _dl_check_map_versions (struct link_map *map, int verbose)
if (def != NULL)
{
ElfW(Verdef) *ent;
- ent = (ElfW(Verdef) *) (map->l_addr + def->d_un.d_ptr);
+ ent = (ElfW(Verdef) *) (map->l_addr + def->d_un.d_ptr);
while (1)
{
if ((unsigned int) (ent->vd_ndx & 0x7fff) > ndx_high)
diff --git a/elf/libdl.map b/elf/libdl.map
new file mode 100644
index 0000000000..d950382346
--- /dev/null
+++ b/elf/libdl.map
@@ -0,0 +1,7 @@
+GLIBC_2.0 {
+ global:
+ dladdr; dlclose; dlerror; dlopen; dlsym; dlvsym;
+
+ local:
+ *;
+}; \ No newline at end of file
diff --git a/elf/link.h b/elf/link.h
index 0e58996b04..c894540e5e 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -255,7 +255,7 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
_dl_catch_error. Returns zero for success, nonzero for failure; and
- arranges for `dlerror' to return the error details.
+ arranges for `dlerror' to return the error details.
ARGS is passed as argument to OPERATE. */
extern int _dlerror_run (void (*operate) (void *), void *args);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:16:12 +0000