From owner-svn-src-head@FreeBSD.ORG Wed Jul 21 08:58:52 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CD1A106566C; Wed, 21 Jul 2010 08:58:52 +0000 (UTC) (envelope-from kaiw@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 52FCB8FC14; Wed, 21 Jul 2010 08:58:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6L8wqQP068182; Wed, 21 Jul 2010 08:58:52 GMT (envelope-from kaiw@svn.freebsd.org) Received: (from kaiw@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6L8wqHe068178; Wed, 21 Jul 2010 08:58:52 GMT (envelope-from kaiw@svn.freebsd.org) Message-Id: <201007210858.o6L8wqHe068178@svn.freebsd.org> From: Kai Wang Date: Wed, 21 Jul 2010 08:58:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210325 - head/lib/libelf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2010 08:58:52 -0000 Author: kaiw Date: Wed Jul 21 08:58:52 2010 New Revision: 210325 URL: http://svn.freebsd.org/changeset/base/210325 Log: Bug fix: when updating headers using the gelf_update_*() functions, the appropriate `dirty' bit needs to be set for both the Elf32 and Elf64 case. Obtained from: elftoolchain MFC after: 1 month Modified: head/lib/libelf/gelf_ehdr.c head/lib/libelf/gelf_phdr.c head/lib/libelf/gelf_shdr.c Modified: head/lib/libelf/gelf_ehdr.c ============================================================================== --- head/lib/libelf/gelf_ehdr.c Wed Jul 21 08:54:46 2010 (r210324) +++ head/lib/libelf/gelf_ehdr.c Wed Jul 21 08:58:52 2010 (r210325) @@ -137,6 +137,8 @@ gelf_update_ehdr(Elf *e, GElf_Ehdr *s) if ((ehdr = _libelf_ehdr(e, ec, 0)) == NULL) return (0); + (void) elf_flagehdr(e, ELF_C_SET, ELF_F_DIRTY); + if (ec == ELFCLASS64) { eh64 = (Elf64_Ehdr *) ehdr; *eh64 = *s; @@ -161,7 +163,5 @@ gelf_update_ehdr(Elf *e, GElf_Ehdr *s) eh32->e_shnum = s->e_shnum; eh32->e_shstrndx = s->e_shstrndx; - (void) elf_flagehdr(e, ELF_C_SET, ELF_F_DIRTY); - return (1); } Modified: head/lib/libelf/gelf_phdr.c ============================================================================== --- head/lib/libelf/gelf_phdr.c Wed Jul 21 08:54:46 2010 (r210324) +++ head/lib/libelf/gelf_phdr.c Wed Jul 21 08:58:52 2010 (r210325) @@ -155,6 +155,8 @@ gelf_update_phdr(Elf *e, int ndx, GElf_P return (0); } + (void) elf_flagphdr(e, ELF_C_SET, ELF_F_DIRTY); + if (ec == ELFCLASS64) { ph64 = e->e_u.e_elf.e_phdr.e_phdr64 + ndx; *ph64 = *s; @@ -172,7 +174,5 @@ gelf_update_phdr(Elf *e, int ndx, GElf_P LIBELF_COPY_U32(ph32, s, p_memsz); LIBELF_COPY_U32(ph32, s, p_align); - (void) elf_flagphdr(e, ELF_C_SET, ELF_F_DIRTY); - return (1); } Modified: head/lib/libelf/gelf_shdr.c ============================================================================== --- head/lib/libelf/gelf_shdr.c Wed Jul 21 08:54:46 2010 (r210324) +++ head/lib/libelf/gelf_shdr.c Wed Jul 21 08:58:52 2010 (r210325) @@ -107,6 +107,8 @@ gelf_update_shdr(Elf_Scn *scn, GElf_Shdr return (0); } + (void) elf_flagscn(scn, ELF_C_SET, ELF_F_DIRTY); + if (ec == ELFCLASS64) { scn->s_shdr.s_shdr64 = *s; return (1); @@ -125,7 +127,5 @@ gelf_update_shdr(Elf_Scn *scn, GElf_Shdr LIBELF_COPY_U32(sh32, s, sh_addralign); LIBELF_COPY_U32(sh32, s, sh_entsize); - (void) elf_flagscn(scn, ELF_C_SET, ELF_F_DIRTY); - return (1); }