Date: Mon, 20 Aug 2012 15:05:29 +0000 (UTC) From: Alexander Kabaev <kan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r239434 - releng/9.1/libexec/rtld-elf Message-ID: <201208201505.q7KF5TUU050997@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kan Date: Mon Aug 20 15:05:29 2012 New Revision: 239434 URL: http://svn.freebsd.org/changeset/base/239434 Log: MFC r239019: Parse notes only after object structure had been allocated. Approved by: re (kib) Modified: releng/9.1/libexec/rtld-elf/map_object.c Directory Properties: releng/9.1/libexec/rtld-elf/ (props changed) Modified: releng/9.1/libexec/rtld-elf/map_object.c ============================================================================== --- releng/9.1/libexec/rtld-elf/map_object.c Mon Aug 20 14:54:30 2012 (r239433) +++ releng/9.1/libexec/rtld-elf/map_object.c Mon Aug 20 15:05:29 2012 (r239434) @@ -153,7 +153,6 @@ map_object(int fd, const char *path, con 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, con 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208201505.q7KF5TUU050997>