Prevent a potential use-after-fee memory corruption bug in the linker (for PE format...
[deliverable/binutils-gdb.git] / ld / emultempl / pe.em
index 663d4ce86202fc2352d6d07874048b1c92d0abf0..ad5d65d024a52c349b0a95ba91abb6a5f207f3d2 100644 (file)
@@ -8,7 +8,7 @@ fi
 rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
 fragment <<EOF
-/* Copyright (C) 1995-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -37,21 +37,10 @@ fragment <<EOF
 
 #define TARGET_IS_${EMULATION_NAME}
 
-/* Do this before including bfd.h, so we prototype the right functions.  */
-
-#if defined(TARGET_IS_armpe) \
-    || defined(TARGET_IS_arm_wince_pe)
-#define bfd_arm_allocate_interworking_sections \
-       bfd_${EMULATION_NAME}_allocate_interworking_sections
-#define bfd_arm_get_bfd_for_interworking \
-       bfd_${EMULATION_NAME}_get_bfd_for_interworking
-#define bfd_arm_process_before_allocation \
-       bfd_${EMULATION_NAME}_process_before_allocation
-#endif
-
 #include "sysdep.h"
 #include "bfd.h"
 #include "bfdlink.h"
+#include "ctf-api.h"
 #include "getopt.h"
 #include "libiberty.h"
 #include "filenames.h"
@@ -78,6 +67,17 @@ fragment <<EOF
 #include "../bfd/libcoff.h"
 #include "../bfd/libpei.h"
 
+#if defined(TARGET_IS_armpe) \
+    || defined(TARGET_IS_arm_wince_pe)
+#define bfd_arm_allocate_interworking_sections \
+       bfd_${EMULATION_NAME}_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+       bfd_${EMULATION_NAME}_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+       bfd_${EMULATION_NAME}_process_before_allocation
+#include "coff-arm.h"
+#endif
+
 #include "deffile.h"
 #include "pe-dll.h"
 #include "safe-ctype.h"
@@ -270,6 +270,7 @@ fragment <<EOF
 #define OPTION_INSERT_TIMESTAMP                (OPTION_TERMINAL_SERVER_AWARE + 1)
 #define OPTION_NO_INSERT_TIMESTAMP     (OPTION_INSERT_TIMESTAMP + 1)
 #define OPTION_BUILD_ID                        (OPTION_NO_INSERT_TIMESTAMP + 1)
+#define OPTION_ENABLE_RELOC_SECTION    (OPTION_BUILD_ID + 1)
 
 static void
 gld${EMULATION_NAME}_add_options
@@ -349,6 +350,7 @@ gld${EMULATION_NAME}_add_options
     {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
     {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
+    {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION},
     {NULL, no_argument, NULL, 0}
   };
 
@@ -483,6 +485,7 @@ gld_${EMULATION_NAME}_list_options (FILE *file)
                                        in object files\n"));
   fprintf (file, _("  --dynamicbase                      Image base address may be relocated using\n\
                                        address space layout randomization (ASLR)\n"));
+  fprintf (file, _("  --enable-reloc-section             Create the base relocation table\n"));
   fprintf (file, _("  --forceinteg               Code integrity checks are enforced\n"));
   fprintf (file, _("  --nxcompat                 Image is compatible with data execution prevention\n"));
   fprintf (file, _("  --no-isolation             Image understands isolation but do not isolate the image\n"));
@@ -855,6 +858,9 @@ gld${EMULATION_NAME}_handle_option (int optc)
 /*  Get DLLCharacteristics bits  */
     case OPTION_DYNAMIC_BASE:
       pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
+      /* fall through */
+    case OPTION_ENABLE_RELOC_SECTION:
+      pe_dll_enable_reloc_section = 1;
       break;
     case OPTION_FORCE_INTEGRITY:
       pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
@@ -1360,7 +1366,8 @@ gld_${EMULATION_NAME}_after_open (void)
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
 
-  if (coff_data (link_info.output_bfd) == NULL
+  if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+      || coff_data (link_info.output_bfd) == NULL
       || coff_data (link_info.output_bfd)->pe == 0)
     einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
           link_info.output_bfd);
@@ -1368,7 +1375,10 @@ gld_${EMULATION_NAME}_after_open (void)
   pe_data (link_info.output_bfd)->pe_opthdr = pe;
   pe_data (link_info.output_bfd)->dll = init[DLLOFF].value;
   pe_data (link_info.output_bfd)->real_flags |= real_flags;
-  pe_data (link_info.output_bfd)->insert_timestamp = insert_timestamp;
+  if (insert_timestamp)
+    pe_data (link_info.output_bfd)->timestamp = -1;
+  else
+    pe_data (link_info.output_bfd)->timestamp = 0;
 
   /* At this point we must decide whether to use long section names
      in the output or not.  If the user hasn't explicitly specified
@@ -1512,7 +1522,7 @@ gld_${EMULATION_NAME}_after_open (void)
                      {
                        struct bfd_symbol *s;
                        struct bfd_link_hash_entry * blhe;
-                       char *other_bfd_filename;
+                       const char *other_bfd_filename;
                        char *n;
 
                        s = (relocs[i]->sym_ptr_ptr)[0];
@@ -1542,7 +1552,7 @@ gld_${EMULATION_NAME}_after_open (void)
                        /* Rename this implib to match the other one.  */
                        n = xmalloc (strlen (other_bfd_filename) + 1);
                        strcpy (n, other_bfd_filename);
-                       is->the_bfd->my_archive->filename = n;
+                       bfd_set_filename (is->the_bfd->my_archive, n);
                      }
 
                    free (relocs);
@@ -1645,13 +1655,27 @@ gld_${EMULATION_NAME}_after_open (void)
                else /* sentinel */
                  seq = 'c';
 
-               new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
-               sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
-               is->the_bfd->filename = new_name;
 
-               new_name = xmalloc (strlen (is->filename) + 3);
-               sprintf (new_name, "%s.%c", is->filename, seq);
-               is->filename = new_name;
+               /* PR 25993: It is possible that is->the_bfd-filename == is->filename.
+                  In which case calling bfd_set_filename on one will free the memory
+                  pointed to by the other.  */
+               if (is->filename == is->the_bfd->filename)
+                 {
+                   new_name = xmalloc (strlen (is->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->filename, seq);
+                   bfd_set_filename (is->the_bfd, new_name);
+                   is->filename = new_name;
+                 }
+               else
+                 {
+                   new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
+                   bfd_set_filename (is->the_bfd, new_name);
+
+                   new_name = xmalloc (strlen (is->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->filename, seq);
+                   is->filename = new_name;
+                 }
              }
          }
       }
@@ -1919,8 +1943,7 @@ gld_${EMULATION_NAME}_finish (void)
          /* Special procesing is required for a Thumb entry symbol.  The
             bottom bit of its address must be set.  */
          val = (h->u.def.value
-                + bfd_get_section_vma (link_info.output_bfd,
-                                       h->u.def.section->output_section)
+                + bfd_section_vma (h->u.def.section->output_section)
                 + h->u.def.section->output_offset);
 
          val |= 1;
@@ -1947,6 +1970,7 @@ gld_${EMULATION_NAME}_finish (void)
 #ifdef DLL_SUPPORT
   if (bfd_link_pic (&link_info)
 #if !defined(TARGET_IS_shpe)
+      || pe_dll_enable_reloc_section
       || (!bfd_link_relocatable (&link_info)
          && pe_def_file->num_exports != 0)
 #endif
@@ -2116,9 +2140,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
                && (nexts->flags & SEC_EXCLUDE) == 0
                && ((nexts->flags ^ flags) & (SEC_LOAD | SEC_ALLOC)) == 0
                && (nexts->owner->flags & DYNAMIC) == 0
-               && nexts->owner->usrdata != NULL
-               && !(((lang_input_statement_type *) nexts->owner->usrdata)
-                    ->flags.just_syms))
+               && !bfd_input_just_syms (nexts->owner))
              flags = (((flags ^ SEC_READONLY)
                        | (nexts->flags ^ SEC_READONLY))
                       ^ SEC_READONLY);
@@ -2153,8 +2175,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
                                                       NULL);
          if (after == NULL)
            /* *ABS* is always the first output section statement.  */
-           after = (&lang_output_section_statement.head
-                    ->output_section_statement);
+           after = (void *) lang_os_list.head;
        }
 
       /* All sections in an executable must be aligned to a page boundary.
@@ -2182,7 +2203,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
 
       ls = &(*pl)->input_section;
 
-      lname = bfd_get_section_name (ls->section->owner, ls->section);
+      lname = bfd_section_name (ls->section);
       if (strchr (lname, '\$') != NULL
          && (dollar == NULL || strcmp (orig_secname, lname) < 0))
        break;
@@ -2350,6 +2371,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   gld_${EMULATION_NAME}_after_parse,
   gld_${EMULATION_NAME}_after_open,
   after_check_relocs_default,
+  before_place_orphans_default,
   after_allocation_default,
   set_output_arch_default,
   ldemul_default_target,
@@ -2370,6 +2392,8 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   gld_${EMULATION_NAME}_recognized_file,
   gld_${EMULATION_NAME}_find_potential_libraries,
   NULL,        /* new_vers_pattern.  */
-  NULL /* extra_map_file_text.  */
+  NULL,        /* extra_map_file_text.  */
+  ${LDEMUL_EMIT_CTF_EARLY-NULL},
+  ${LDEMUL_EXAMINE_STRTAB_FOR_CTF-NULL}
 };
 EOF
This page took 0.026707 seconds and 4 git commands to generate.