Date: Sat, 21 Aug 2010 18:51:25 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r211586 - in stable/7/sys: boot/common kern Message-ID: <201008211851.o7LIpPaC078076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sat Aug 21 18:51:25 2010 New Revision: 211586 URL: http://svn.freebsd.org/changeset/base/211586 Log: MFC r210423: completely ignore zero-sized elf sections in modules of elf object type (amd64) Modified: stable/7/sys/boot/common/load_elf_obj.c stable/7/sys/kern/link_elf_obj.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/boot/common/load_elf_obj.c ============================================================================== --- stable/7/sys/boot/common/load_elf_obj.c Sat Aug 21 18:48:24 2010 (r211585) +++ stable/7/sys/boot/common/load_elf_obj.c Sat Aug 21 18:51:25 2010 (r211586) @@ -221,6 +221,8 @@ __elfN(obj_loadimage)(struct preloaded_f for (i = 0; i < hdr->e_shnum; i++) shdr[i].sh_addr = 0; for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_size == 0) + continue; switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: Modified: stable/7/sys/kern/link_elf_obj.c ============================================================================== --- stable/7/sys/kern/link_elf_obj.c Sat Aug 21 18:48:24 2010 (r211585) +++ stable/7/sys/kern/link_elf_obj.c Sat Aug 21 18:51:25 2010 (r211586) @@ -522,6 +522,8 @@ link_elf_load_file(linker_class_t cls, c symtabindex = -1; symstrindex = -1; for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_size == 0) + continue; switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: @@ -644,6 +646,8 @@ link_elf_load_file(linker_class_t cls, c /* Size up code/data(progbits) and bss(nobits). */ alignmask = 0; for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_size == 0) + continue; switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: @@ -704,6 +708,8 @@ link_elf_load_file(linker_class_t cls, c ra = 0; alignmask = 0; for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_size == 0) + continue; switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008211851.o7LIpPaC078076>