diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-10-06 13:43:26 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-10-07 10:25:38 +0200 |
| commit | 96961bf71d7e13d23dd497094257794504aeb673 (patch) | |
| tree | f0aeb9bb2824907505002ab0ed1e45027434a934 | |
| parent | b0f3a2e43fb9de9a4a2f4dfbdb84b98994752bc4 (diff) | |
| download | glibc-96961bf71d7e13d23dd497094257794504aeb673.tar.gz glibc-96961bf71d7e13d23dd497094257794504aeb673.tar.xz glibc-96961bf71d7e13d23dd497094257794504aeb673.zip | |
Fix descriptor leak when calling dlopen with RTLD_NOLOAD
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-load.c | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7192970335..934a8663af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-06 Andreas Schwab <schwab@redhat.com> + + * elf/dl-load.c (_dl_map_object_from_fd): Close fd before + returning if RTLD_NOLOAD. + 2009-10-06 Roland McGrath <roland@redhat.com> * sysdeps/x86_64/multiarch/strstr-c.c diff --git a/elf/dl-load.c b/elf/dl-load.c index 0b896d9b47..597193c043 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -903,9 +903,12 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, #endif if (mode & RTLD_NOLOAD) - /* We are not supposed to load the object unless it is already - loaded. So return now. */ - return NULL; + { + /* We are not supposed to load the object unless it is already + loaded. So return now. */ + __close (fd); + return NULL; + } /* Print debugging message. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) |