From: Alan Modra <amodra@gmail.com>
Date: Thu, 31 Aug 2017 03:18:37 +0000 (+0930)
Subject: PR22048, Incorrect .eh_frame section in libc.so
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af471f828cc74d65b50a7531ba2c69522266cfe9;p=binutils-gdb.git

PR22048, Incorrect .eh_frame section in libc.so

	PR 21441
	PR 22048
	* elflink.c (bfd_elf_discard_info): Don't pad embedded zero
	terminators.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c1d83f20573..edc447e781a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-31  Alan Modra  <amodra@gmail.com>
+
+	PR 21441
+	PR 22048
+	* elflink.c (bfd_elf_discard_info): Don't pad embedded zero
+	terminators.
+
 2017-08-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.ac (bfd_backends): Add elf64.lo together with
diff --git a/bfd/elflink.c b/bfd/elflink.c
index ceacb37e4c8..f6f57fa4154 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -13878,17 +13878,22 @@ bfd_elf_discard_info (bfd *output_bfd, struct bfd_link_info *info)
 	  /* Any prior sections must pad the last FDE out to the
 	     output section alignment.  Otherwise we might have zero
 	     padding between sections, which would be seen as a
-	     terminator.  */
+	     terminator.  If there is a terminator in the middle of
+	     FDEs, don't increase its size as that will write bogus
+	     data of whatever was after the terminator in the input
+	     file, to the output file.  */
 	  for (; i != NULL; i = i->map_tail.s)
-	    {
-	      bfd_size_type size = (i->size + eh_alignment - 1) & -eh_alignment;
-	      if (i->size != size)
-		{
-		  i->size = size;
-		  changed = 1;
-		  eh_changed = 1;
-		}
-	    }
+	    if (i->size != 4)
+	      {
+		bfd_size_type size
+		  = (i->size + eh_alignment - 1) & -eh_alignment;
+		if (i->size != size)
+		  {
+		    i->size = size;
+		    changed = 1;
+		    eh_changed = 1;
+		  }
+	      }
 	}
       if (eh_changed)
 	elf_link_hash_traverse (elf_hash_table (info),