From 642b7593c3b3488d229488a436bab294dcc27ee9 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 5 Oct 2012 01:15:25 -0400 Subject: [PATCH] fix race condition in dlopen orig_tail was being saved before the lock was obtained, allowing dlopen failure to roll-back other dlopens that had succeeded. --- src/ldso/dynlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index e09f0715..2bbd492a 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -886,7 +886,7 @@ void *__dynlink(int argc, char **argv) void *dlopen(const char *file, int mode) { - struct dso *volatile p, *orig_tail = tail, *next; + struct dso *volatile p, *orig_tail, *next; size_t i; int cs; @@ -895,6 +895,8 @@ void *dlopen(const char *file, int mode) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); pthread_rwlock_wrlock(&lock); + orig_tail = tail; + if (setjmp(rtld_fail)) { /* Clean up anything new that was (partially) loaded */ if (p->deps) for (i=0; p->deps[i]; i++) -- 2.20.1