From c5ab5bd3be15eb9d49222df132a51ae8e8f78cbc Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 21 Apr 2015 13:22:48 -0400 Subject: [PATCH] remove always-true conditional in dynamic linker TLSDESC processing the allocating path which can fail is for dynamic TLS, which can only occur at runtime, and the check for runtime was already made in the outer conditional. --- src/ldso/dynlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index efb00496..7c92ef6c 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -340,7 +340,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri error( "Error relocating %s: cannot allocate TLSDESC for %s", dso->name, sym ? name : "(local)" ); - if (runtime) longjmp(*rtld_fail, 1); + longjmp(*rtld_fail, 1); } new->next = dso->td_index; dso->td_index = new; -- 2.25.1