Fix linker segfault that occured when linking ia64-linux kernel.

	* dwarf2.c (struct dwarf2_debug): New field dwarf_line_size.
	(decode_line_info): Set it.  Report error if unit->line_offset is
	equal to or larger than it.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ab63a3529c85f2d649b9ae637923d095bff6e471..3c07b36d0d72d409e07c084071eb37db47793a04 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  7 11:33:47 2000  Jim Wilson  <wilson@cygnus.com>
+
+       * dwarf2.c (struct dwarf2_debug): New field dwarf_line_size.
+       (decode_line_info): Set it.  Report error if unit->line_offset is
+       equal to or larger than it.
+
 2000-04-07  Timothy Wall  <twall@cygnus.com>
 
        * targets.c: Added vecs for tic54x.

diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 5710d1adbd0d00b1c09fd2a0572e661adc997ab4..92397a2e119e2dc75b2c84c108cb16fa52455aaf 100644 (file)
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -102,6 +102,9 @@ struct dwarf2_debug {
 
   /* Buffer for decode_line_info.  */
   char *dwarf_line_buffer;
+
+  /* Length of the loaded .debug_line section.  */
+  unsigned long dwarf_line_size;
 };
 
 struct arange {
@@ -783,7 +786,6 @@ decode_line_info (unit)
   if (! stash->dwarf_line_buffer)
     {
       asection *msec;
-      unsigned long size;
 
       msec = bfd_get_section_by_name (abfd, ".debug_line");
       if (! msec)
@@ -793,20 +795,31 @@ decode_line_info (unit)
          return 0;
        }
       
-      size = msec->_raw_size;
-      stash->dwarf_line_buffer = (char *) bfd_alloc (abfd, size);
+      stash->dwarf_line_size = msec->_raw_size;
+      stash->dwarf_line_buffer = (char *) bfd_alloc (abfd, stash->dwarf_line_size);
       if (! stash->dwarf_line_buffer)
        return 0;
 
       if (! bfd_get_section_contents (abfd, msec, 
                                      stash->dwarf_line_buffer, 0,
-                                     size))
+                                     stash->dwarf_line_size))
        return 0;
 
       /* FIXME: We ought to apply the relocs against this section before
         we process it.... */
     }
 
+  /* Since we are using un-relocated data, it is possible to get a bad value
+     for the line_offset.  Validate it here so that we won't get a segfault
+     below.  */
+  if (unit->line_offset >= stash->dwarf_line_size)
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: Line offset (%u) bigger than line size (%u)."),
+                            unit->line_offset, stash->dwarf_line_size);
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
   table = (struct line_info_table*) bfd_alloc (abfd, 
                                               sizeof (struct line_info_table));
   table->abfd = abfd;