From 31148ca2ff5d11a911754c8f5e64ee67856111de Mon Sep 17 00:00:00 2001 From: kan Date: Mon, 20 Aug 2012 15:05:29 +0000 Subject: [PATCH] MFC r239019: Parse notes only after object structure had been allocated. Approved by: re (kib) git-svn-id: svn://svn.freebsd.org/base/releng/9.1@239434 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rtld-elf/map_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index 509a64f4..79e41322 100644 --- 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; } @@ -291,7 +290,8 @@ map_object(int fd, const char *path, const struct stat *sb) obj->stack_flags = stack_flags; 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); munmap(hdr, PAGE_SIZE); return (obj); -- 2.42.0