diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-09-04 13:18:28 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-09-04 13:18:28 -0700 |
| commit | dae6f911e3f44ce05bda41d89d77cd74ff9213ac (patch) | |
| tree | 371c6a1b61e29f1be3484a631c9b962d68dce22b | |
| parent | edb3cb88310fe7a2fecebd8cb487b17f5f7a185d (diff) | |
| download | glibc-hjl/pr14370.tar.gz glibc-hjl/pr14370.tar.xz glibc-hjl/pr14370.zip | |
Check mismatched TLS/non-TLS symbols hjl/pr14370
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5411be3138..838c60795f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-09-04 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #14370] + * elf/dl-lookup.c (_dl_lookup_symbol_x): Check mismatched + TLS/non-TLS symbols. + 2012-09-04 Florian Weimer <fweimer@redhat.com> * stdlib/tst-secure-getenv.c (alternative_main): Only warn on SGID diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index e7f7148381..85bfb51e38 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -840,6 +840,31 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, ? undef_map->l_scope : symbol_scope, version, type_class, flags, skip_map); + if (__builtin_expect (*ref != NULL, 1) + && (__builtin_expect (ELFW(ST_TYPE) (current_value.s->st_info) == STT_TLS, 0) + || __builtin_expect (ELFW(ST_TYPE) ((*ref)->st_info) == STT_TLS, 0)) + && __builtin_expect (ELFW(ST_TYPE) (current_value.s->st_info) != + ELFW(ST_TYPE) ((*ref)->st_info), 1)) + { + const char *reference_name = undef_map ? undef_map->l_name : ""; + const char *definition_name = (current_value.m->l_name[0] + ? current_value.m->l_name + : rtld_progname); + _dl_signal_cerror (0, (reference_name[0] + ? reference_name + : (rtld_progname ?: "<main program>")), + N_("symbol lookup error"), + make_string ((ELFW(ST_TYPE) ((*ref)->st_info) == STT_TLS + ? "TLS" : "non-TLS"), + " definition `", undef_name, + "' mismatches ", + (ELFW(ST_TYPE) (current_value.s->st_info) == STT_TLS + ? "TLS" : "non-TLS"), + " reference in ", definition_name)); + *ref = NULL; + return 0; + } + /* The object is used. */ if (__builtin_expect (current_value.m->l_used == 0, 0)) current_value.m->l_used = 1; |