diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-05-21 12:51:43 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2010-05-31 19:00:16 +0200 |
| commit | d0d308e32b10a0776c6b7d5748b96bb5a9076f96 (patch) | |
| tree | 568c61cd86497caf200aab2b220c77e878dc35ce | |
| parent | a8226edc795e0f3682eec8be3ee183422eaefd24 (diff) | |
| download | glibc-d0d308e32b10a0776c6b7d5748b96bb5a9076f96.tar.gz glibc-d0d308e32b10a0776c6b7d5748b96bb5a9076f96.tar.xz glibc-d0d308e32b10a0776c6b7d5748b96bb5a9076f96.zip | |
Don't crash on unresolved weak symbol reference
(cherry picked from commit 9acbe24da8c71704d03e30d1223f997442d4be0c)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-runtime.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 1a571ec554..97bd0bc577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-19 Andreas Schwab <schwab@redhat.com> + + * elf/dl-runtime.c (_dl_fixup): Don't crash on unresolved weak + symbol reference. + 2010-05-21 Andreas Schwab <schwab@redhat.com> * sunrpc/clnt_tcp.c (clnttcp_control): Add missing break. diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index a52120d121..181af7dfac 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -1,5 +1,5 @@ /* On-demand PLT fixup for shared objects. - Copyright (C) 1995-2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -144,7 +144,8 @@ _dl_fixup ( /* And now perhaps the relocation addend. */ value = elf_machine_plt_value (l, reloc, value); - if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0)) + if (sym != NULL + && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0)) value = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) (); /* Finally, fix up the plt itself. */ @@ -369,7 +370,7 @@ _dl_profile_fixup ( struct audit_ifaces *afct = GLRO(dl_audit); for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) { - if (afct->ARCH_LA_PLTENTER != NULL + if (afct->ARCH_LA_PLTENTER != NULL && (reloc_result->enterexit & (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0) { |