rtld: Parse notes later (bug# 2376)

Parse notes only after object structure has been allocated.

Taken-from: FreeBSD svn 239019
DragonFly-bug: <http://bugs.dragonflybsd.org/issue/2376>

diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 215ae0c..14cedfc 100644 (file)
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -153,7 +153,6 @@ map_object(int fd, const char *path, const struct stat *sb)
                break;
            note_start = (Elf_Addr)(char *)hdr + phdr->p_offset;
            note_end = note_start + phdr->p_filesz;
-           digest_notes(obj, note_start, note_end);
            break;
        }
 
@@ -299,6 +298,8 @@ map_object(int fd, const char *path, const struct stat *sb)
         obj->relro_page = obj->relocbase + trunc_page(relro_page);
         obj->relro_size = round_page(relro_size);
     }
+    if (note_start < note_end)
+       digest_notes(obj, note_start, note_end);
     return obj;
 }