svn commit: r327489 - head/contrib/elftoolchain/elfcopy

Ed Maste emaste at FreeBSD.org
Tue Jan 2 14:07:56 UTC 2018


Author: emaste
Date: Tue Jan  2 14:07:55 2018
New Revision: 327489
URL: https://svnweb.freebsd.org/changeset/base/327489

Log:
  elfcopy: copy raw (untranslated) contents to binary output
  
  Previously elfcopy used elf_getdata to obtain data from ELF sections
  being copied to binary output, but elf_getdata returns data that has
  been translated - that is, data is in host byte order. When the host and
  target differ in endianness (e.g., converting a big-endian MIPS ELF
  object to binary on an x86 host) this resulted in byte-swapped data in
  certain sections such as .dynamic.
  
  Instead use elf_rawdata to keep data in the original, target endianness.
  
  Reported by:	Hiroki Mori <yamori83 at yahoo.co.jp>, Bill Yuan
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/elftoolchain/elfcopy/binary.c

Modified: head/contrib/elftoolchain/elfcopy/binary.c
==============================================================================
--- head/contrib/elftoolchain/elfcopy/binary.c	Tue Jan  2 09:02:42 2018	(r327488)
+++ head/contrib/elftoolchain/elfcopy/binary.c	Tue Jan  2 14:07:55 2018	(r327489)
@@ -101,10 +101,10 @@ create_binary(int ifd, int ofd)
 		    sh.sh_size == 0)
 			continue;
 		(void) elf_errno();
-		if ((d = elf_getdata(scn, NULL)) == NULL) {
+		if ((d = elf_rawdata(scn, NULL)) == NULL) {
 			elferr = elf_errno();
 			if (elferr != 0)
-				warnx("elf_getdata failed: %s", elf_errmsg(-1));
+				warnx("elf_rawdata failed: %s", elf_errmsg(-1));
 			continue;
 		}
 		if (d->d_buf == NULL || d->d_size == 0)


More information about the svn-src-head mailing list